Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Nov 2011 14:53:22 +0000 (07:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Nov 2011 14:53:22 +0000 (07:53 -0700)
commit30307c69d59b14723fbf8a524847b302388c702d
treee6aa7eb7e6b5c567d0f07a3e956ffd9c0b70f3cd
parent4536e4d1d21c8172402a2217b0fa1880665ace36
parentd682bd7f38b73e5dff0b5584c8ec301ccf76e4db
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