From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Nov 2011 14:53:22 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: MMI-PSA29.97-13-9~18140
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=30307c69d59b14723fbf8a524847b302388c702d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  Revert "HID: multitouch: decide if hid-multitouch needs to handle mt devices"
  HID: drivers/hid/hid-roccat.c: eliminate a null pointer dereference
  HID: hid-apple: add device ID of another wireless aluminium
  HID: Add device IDs for Macbook Pro 8 keyboards
---

30307c69d59b14723fbf8a524847b302388c702d