From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Oct 2012 22:39:28 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=296bac30f6b62e1e985d3e7c0bd9c92b971b2dab;p=deliverable%2Flinux.git

Merge branch 'for-linus' of git://git./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
---

296bac30f6b62e1e985d3e7c0bd9c92b971b2dab