]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'kbuild/kbuild' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 26 Nov 2014 14:24:50 +0000 (15:24 +0100)
committerMichal Marek <mmarek@suse.cz>
Wed, 26 Nov 2014 14:24:50 +0000 (15:24 +0100)
1  2 
Makefile

diff --cc Makefile
Simple merge