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)
commit72c16d9a5c303dce928a52a8861fe7a2a25f849a
treeb38d03007abcfadf12619d422169a6d4d4000ce7
parent4f5a81042909fed6977881f22c024aa3582cfcca
parentfb4d8d98dc24f66f7f98e6506fad63e1c320cd82
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