From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Jun 2011 16:00:50 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=375ac3e09640fb16b6e6f1a1f1ee8aec30183fdf;p=~shefty%2Frdma-dev.git

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

375ac3e09640fb16b6e6f1a1f1ee8aec30183fdf