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)
commit7ed89aed2b897059c3d733cbd4994035b4ce1fba
tree2791d3ce5e40f2a3b5d7b937df259f9d59870a0b
parentc2b5adb4868c190dd9d6dc624567fa38f1ba79af
parentb1807719f6acdf18cc4bde3b5400d05d77801494
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: Correct General touch PID