]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 19 Dec 2011 08:17:28 +0000 (09:17 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 19 Dec 2011 08:17:28 +0000 (09:17 +0100)
1  2 
drivers/hid/Kconfig

Simple merge