Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
commit375ac3e09640fb16b6e6f1a1f1ee8aec30183fdf
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 16:00:50 +0000 (27 09:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 16:00:50 +0000 (27 09:00 -0700)
treee6964eff8ecfc21ec1752f176c7d1a001074de4b
parentedcda265225b90c8700b21758fffcba61d19e046
parentc3ead6de4f6bd1c08a81f84e629e3dbf4a9078f0
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:
  HID: hid-multitouch: add support for a new Lumio dual-touch panel
  HID: hid-multitouch: correct VID for Stantum panels
  HID: hid-multitouch: ensure slots are initialized