From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Dec 2011 16:25:46 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: firefly_0821_release~3680^2~4015
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7ed89aed2b897059c3d733cbd4994035b4ce1fba;p=firefly-linux-kernel-4.4.55.git

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
---

7ed89aed2b897059c3d733cbd4994035b4ce1fba