]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 23:43:15 +0000 (10:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 23:43:15 +0000 (10:43 +1100)
commit4b75040d853dd4687a060a29930b872be2bf4921
treee18cd6a151d8979f2d8aed44bd6229e8b5956f92
parent4de1cf3586539a0621095a7ecc3951b8686b5189
parent285aa9405cdcd9c98dd85a9a664af040d9f228f5
Merge remote-tracking branch 'm68knommu/for-next'

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