summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-13 19:33:18 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-13 19:33:18 +0200
commit39ea32ca7e425cde24df04f34bf76746ea028681 (patch)
tree16efe31381658509349727e7e43c23758e7a32fb /fs
parentMerge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentInput: xpad - add Andamiro Pump It Up pad (diff)
downloadlinux-39ea32ca7e425cde24df04f34bf76746ea028681.tar.xz
linux-39ea32ca7e425cde24df04f34bf76746ea028681.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input layer fixes from Dmitry Torokhov: "The changes are limited to adding new VID/PID combinations to drivers to enable support for new versions of hardware, most notably hardware found in new MacBook Pro Retina boxes." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: xpad - add Andamiro Pump It Up pad Input: xpad - add signature for Razer Onza Tournament Edition Input: xpad - handle all variations of Mad Catz Beat Pad Input: bcm5974 - Add support for 2012 MacBook Pro Retina HID: add support for 2012 MacBook Pro Retina
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions