tree 5c6fe90670524be4db95fd1f367f88e5c4c179bb
parent 33046957cd71e524e3cb2a209d9e1363ac6cf3d6
parent 8d80da90f53d37cf6caefc61353e1cc3a145b9e0
author Linus Torvalds <torvalds@linux-foundation.org> 1351723168 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1351723168 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID updates from Jiri Kosina:
 "This contains fixes for two devices by Jiri Slaby and Xianhan Yu, new
  device IDs for MacBook Pro 10,2 from Dirk Hohndel and generic
  multitouch code fix from Alan Cox."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: Add support for the MacBook Pro 10,2 keyboard / touchpad
  HID: multitouch: fix maxcontacts problem on GeneralTouch
  HID: multitouch: put the case in the right switch statement
  HID: microsoft: fix invalid rdesc for 3k kbd