]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'kbuild/kbuild' into kbuild/for-next
authorMichal Marek <mmarek@suse.com>
Thu, 8 Oct 2015 14:00:17 +0000 (16:00 +0200)
committerMichal Marek <mmarek@suse.com>
Thu, 8 Oct 2015 14:00:17 +0000 (16:00 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge