diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 16:34:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 16:34:14 -0700 |
| commit | ecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6 (patch) | |
| tree | 8aee0b8d86b71617051dded87e2b7c1ae6c7e55d /drivers/block/floppy.c | |
| parent | a1a739c56ad031b8bf8b3804f568ac88899f8dd7 (diff) | |
| parent | cc6e0bbb47f02fd36cd55b3189c0c79079096ab8 (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: Add support for Sony Vaio VGX-TP1E
HID: fix lock imbalance in hiddev
HID: fix lock imbalance in hidraw
HID: fix hidbus/appletouch device binding regression
HID: add hid_type to general hid struct
HID: quirk for OLED devices present in ASUS G50/G70/G71
HID: Remove "default m" for Thrustmaster and Zeroplus
HID: fix hidraw_exit section mismatch
HID: add support for another Gyration remote control
Revert "HID: Invert HWHEEL mappings for some Logitech mice"
Diffstat (limited to 'drivers/block/floppy.c')
0 files changed, 0 insertions, 0 deletions