]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 20 Nov 2011 23:25:42 +0000 (10:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 20 Nov 2011 23:25:42 +0000 (10:25 +1100)
commita52bbf988121f57ae78b636bbc5e0f52b0430d60
tree6fb562b4a4ebb1cf98f0d41b39744f31a5bd482f
parentca9ce0e7bc979b6b1fe7467e8a8a5406b2da86b0
parentd0bf61cd041c4aff8d3742e18b5e474747914beb
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/Kconfig.debug
arch/m68k/Kconfig.debug