]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'kbuild/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 00:37:53 +0000 (11:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 00:37:53 +0000 (11:37 +1100)
1  2 
Makefile

diff --cc Makefile
Simple merge