]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into...
authorJiri Kosina <jkosina@suse.cz>
Tue, 28 May 2013 09:29:12 +0000 (11:29 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 28 May 2013 09:29:12 +0000 (11:29 +0200)
1  2  3 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

Simple merge
Simple merge