tree b38d03007abcfadf12619d422169a6d4d4000ce7
parent 4f5a81042909fed6977881f22c024aa3582cfcca
parent fb4d8d98dc24f66f7f98e6506fad63e1c320cd82
author Jiri Kosina <jkosina@suse.cz> 1367309868 +0200
committer Jiri Kosina <jkosina@suse.cz> 1367309868 +0200

Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus

Conflicts:
	drivers/hid/hid-multitouch.c