]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:39:54 +0000 (09:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:39:54 +0000 (09:39 +1000)
1  2 
arch/m68k/Kconfig.cpu
arch/m68k/platform/coldfire/head.S

Simple merge
Simple merge