diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-13 10:33:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-13 10:33:18 -0700 |
| commit | 39ea32ca7e425cde24df04f34bf76746ea028681 (patch) | |
| tree | 16efe31381658509349727e7e43c23758e7a32fb /drivers/input/matrix-keymap.c | |
| parent | 8488e4088f7be12613a09301f4d6e51f23c91bbd (diff) | |
| parent | e76b8ee25e034ab601b525abb95cea14aa167ed3 (diff) | |
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 'drivers/input/matrix-keymap.c')
0 files changed, 0 insertions, 0 deletions