]> 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)
commite99b5d5a61a99c8aca5ba96eac7e4bf65a9d284e
treeb38d03007abcfadf12619d422169a6d4d4000ce7
parent97ff49154d7c5e26c6258bf17c5ff803ffbbe80a
parent086b5b5f7bfed70e1c995c11cc3677e12d235dab
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