]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 17 Aug 2012 00:24:14 +0000 (10:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 17 Aug 2012 00:24:14 +0000 (10:24 +1000)
1  2 
arch/m68k/Kconfig
arch/m68k/Kconfig.cpu

Simple merge
Simple merge