]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Tue, 24 Mar 2015 16:38:14 +0000 (17:38 +0100)
committerMichal Marek <mmarek@suse.cz>
Tue, 24 Mar 2015 16:38:14 +0000 (17:38 +0100)
1  2  3 
Makefile

diff --cc Makefile
Simple merge