]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'llvmlinux/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 06:23:07 +0000 (16:23 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 06:23:07 +0000 (16:23 +1000)
1  2 
Makefile

diff --cc Makefile
Simple merge