]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'kbuild/kconfig' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 7 Jan 2015 20:40:49 +0000 (21:40 +0100)
committerMichal Marek <mmarek@suse.cz>
Wed, 7 Jan 2015 20:40:49 +0000 (21:40 +0100)
1  2 
init/Kconfig

diff --cc init/Kconfig
Simple merge