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)
Conflicts:
drivers/hid/hid-multitouch.c

1  2 
drivers/hid/hid-multitouch.c
include/linux/hid.h

Simple merge
Simple merge