]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.1/upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 16 Mar 2015 15:17:17 +0000 (16:17 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 16 Mar 2015 15:17:17 +0000 (16:17 +0100)
1  2 
drivers/hid/Kconfig

Simple merge