]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jul 2012 17:33:18 +0000 (10:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jul 2012 17:33:18 +0000 (10:33 -0700)
commit31fb59a1b3d3a29c7d191b68e4e3f284695296ef
tree16efe31381658509349727e7e43c23758e7a32fb
parentaab7e10ff629f3c8c87a839f1b6e90c6c31bcf6f
parent41d1b7cf7e75798e31f03d8cce57a72c73653e70
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
drivers/hid/hid-apple.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/input/joystick/xpad.c
drivers/input/mouse/bcm5974.c