]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Sun, 20 Nov 2011 09:23:18 +0000 (10:23 +0100)
committerJiri Kosina <jkosina@suse.cz>
Sun, 20 Nov 2011 09:23:18 +0000 (10:23 +0100)
1  2 
drivers/hid/hid-core.c

Simple merge