diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:08:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:08:26 -0800 |
| commit | 5e51d16ddefa0874993f42a4b2beb13127feda76 (patch) | |
| tree | b4073612b9c504f5a8ee66e2c0a1dfc6a18baf08 /drivers/net | |
| parent | 7f302fe3173c61e0e4fcf0a6a906ae297225e3be (diff) | |
| parent | 2b639386a2a26c84c8d26c649cf657ebd43a7bc8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: fix bus endianity in file2alias
HID: move tmff and zpff devices from ignore_list to blacklist
HID: unlock properly on error paths in hidraw_ioctl()
HID: blacklist Powercom USB UPS
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions