]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.15/multitouch' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 5 Mar 2014 13:30:18 +0000 (14:30 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 5 Mar 2014 13:30:18 +0000 (14:30 +0100)
1  2 
drivers/hid/hid-ids.h

Simple merge