summaryrefslogtreecommitdiff
path: root/trie.c
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-03 21:29:13 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-03 21:29:13 +0200
commitcfa76744cb9cea2649b0155b1bbdd0233a814307 (patch)
treef428feb73e577a9207a16bfb4fd818a95809eb24 /trie.c
parent489e84be7639caeb246b2dbaccd2a6e9fda9d2a5 (diff)
dev: linktype: use ARPHRD_ETHER for "any" device
Use ARPHRD_ETHER for the "any" device, so that when typing "netsniff-ng" without any arguments, ethernet is assumed. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'trie.c')
0 files changed, 0 insertions, 0 deletions
b4c62aeed3ff4cae3'>diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina: - regression fix (sleeping while atomic) for cp2112, from Johan Hovold - regression fix for proximity handling under certain circumstances in Wacom driver, from Jason Gerecke - functional fix for Logitech Rumblepad 2, from Ardinartsev Nikita * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: cp2112: fix gpio-callback error handling HID: cp2112: fix sleep-while-atomic HID: hid-lg: Fix immediate disconnection of Logitech Rumblepad 2 HID: usbhid: Quirk a AMI virtual mouse and keyboard with ALWAYS_POLL HID: wacom: Fix poor prox handling in 'wacom_pl_irq'
Diffstat (limited to 'drivers/usb/misc/cytherm.c')