aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cdrom/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-01-28 16:52:20 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-01-28 16:52:20 -0500
commitf4798748dee00c807a63f5518f08b3df161e0f6d (patch)
tree9b4c12712874de48c5ff1d437e584052bbec21f7 /drivers/cdrom/Makefile
parent8d01eddf292dcd78b640418c80fb300532799cd4 (diff)
parent3bce6f981aeeb7d0c14520cecd947716b377ef83 (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: (24 commits) HID: ADS/Tech Radio si470x needs blacklist entry HID: Logitech Extreme 3D needs NOGET quirk HID: Refactor MS Presenter 8K key mapping HID: MS Presenter mapping for PID 0x0701 HID: Support Samsung IR remote HID: fix compilation of hidbp drivers without usbhid HID: Blacklist the Gretag-Macbeth Huey display colorimeter HID: the `bit' in hidinput_mapping_quirks() is an out parameter HID: remove redundant WARN_ON()s in order not to scare users HID: force hiddev creation for SONY PS3 controller HID: Use hid blacklist in usbmouse/usbkbd HID: proper handling of MS 4k and 6k devices HID: remove unused variable in quirk event handler HID: hid-input quirk for BTC 8193 HID: separate hid-input event quirks from generic code HID: refactor mapping to input subsystem for quirky devices HID: Microsoft Wireless Optical Desktop 3.0 quirk HID: Add support for Logitech Elite keyboards HID: add full support for Genius KB-29E HID: fix a potential bug in pointer casting ...
Diffstat (limited to 'drivers/cdrom/Makefile')
0 files changed, 0 insertions, 0 deletions