]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'kbuild/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Apr 2013 01:40:40 +0000 (11:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Apr 2013 01:40:40 +0000 (11:40 +1000)
1  2 
Makefile

diff --cc Makefile
Simple merge