]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 30 Apr 2013 08:17:48 +0000 (10:17 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 30 Apr 2013 08:17:48 +0000 (10:17 +0200)
commitfe50fc1baa2ec066394937d8241e457a72678695
treeb38d03007abcfadf12619d422169a6d4d4000ce7
parentd37ad6988f71a41f64ff579e80210d2895772213
parentcb22c1f23024b407de241e704143ecf2ee6d139a
Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus

Conflicts:
drivers/hid/hid-multitouch.c
drivers/hid/hid-multitouch.c
include/linux/hid.h