]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'kselftest/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 04:50:55 +0000 (15:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 04:50:55 +0000 (15:50 +1100)
1  2 
Makefile

diff --cc Makefile
Simple merge