]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'kbuild/misc' into kbuild/for-next
authorMichal Marek <mmarek@suse.com>
Fri, 28 Aug 2015 15:07:02 +0000 (17:07 +0200)
committerMichal Marek <mmarek@suse.com>
Fri, 28 Aug 2015 15:07:02 +0000 (17:07 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge