]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'cris/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 00:18:36 +0000 (11:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 00:18:36 +0000 (11:18 +1100)
1  2 
arch/cris/include/asm/Kbuild

Simple merge