]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.13/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 11 Nov 2013 10:26:43 +0000 (11:26 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 11 Nov 2013 10:26:43 +0000 (11:26 +0100)
1  2 
drivers/hid/Kconfig

Simple merge