diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-10 00:50:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-10 00:50:31 +0200 |
| commit | 36b774102e5ede8d0384684bd394c8285dce5a53 (patch) | |
| tree | 15e44ae97f635db6a5dbe84bd4e730cfe49a86d5 /fs/splice.c | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| parent | Merge branches 'debug-module-param' and 'upstream' into for-linus (diff) | |
| download | linux-36b774102e5ede8d0384684bd394c8285dce5a53.tar.xz linux-36b774102e5ede8d0384684bd394c8285dce5a53.zip | |
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: handle cases of volume knobs generating relative values
HID: Logitech keyboard 0xc311 needs reset leds quirk
HID: support for logitech cordless desktop LX500 special mapping
HID: fix autocentering of PID devices
HID: separate quirks for report descriptor fixup
HID: Add NOGET quirk for all NCR devices
HID: support for Petalynx Maxter remote control
HID: fix mismatch between hid-input HUT find/search mapping and the HUT
HID: support for Gameron dual psx adaptor
USB HID: avoid flush_scheduled_work()
HID: Use menuconfig objects
HID: force hid-input for Microsoft SideWinder GameVoice device
HID: input mapping for Chicony KU-0418 tactical pad
HID: make debugging output runtime-configurable
Diffstat (limited to 'fs/splice.c')
0 files changed, 0 insertions, 0 deletions