]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 4 Oct 2011 12:04:32 +0000 (14:04 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 4 Oct 2011 12:04:32 +0000 (14:04 +0200)
1  2 
drivers/hid/hid-core.c

Simple merge