From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ed89aed2b897059c3d733cbd4994035b4ce1fba;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.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