]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'kbuild/kbuild' into kbuild/for-next
authorMichal Marek <mmarek@suse.cz>
Mon, 27 Apr 2015 12:32:22 +0000 (14:32 +0200)
committerMichal Marek <mmarek@suse.cz>
Mon, 27 Apr 2015 12:32:22 +0000 (14:32 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge