]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'multitouch' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 26 Sep 2011 12:19:53 +0000 (14:19 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 26 Sep 2011 12:19:53 +0000 (14:19 +0200)
1  2 
drivers/hid/hid-core.c
include/linux/hid.h

Simple merge
Simple merge