]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 27 Jun 2011 10:40:22 +0000 (12:40 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 27 Jun 2011 10:40:22 +0000 (12:40 +0200)
1  2 
drivers/hid/Kconfig

Simple merge