Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Dec 2011 16:25:46 +0000 (08:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Dec 2011 16:25:46 +0000 (08:25 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: Correct General touch PID


Trivial merge