]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 13 Apr 2012 16:17:25 +0000 (18:17 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 13 Apr 2012 16:17:25 +0000 (18:17 +0200)
1  2 
drivers/hid/Kconfig
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

Simple merge
Simple merge
Simple merge