]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 00:59:59 +0000 (11:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 00:59:59 +0000 (11:59 +1100)
commit8a8016dfe5be1b9760c1426009233dc224bd202c
tree8eb1a000a82e8817a72f46ebf163f6afc7dcdb2f
parent8393b9fcb49606274437d3ccbdbd7d55049bb639
parent1c054ea934da182b1b128c64ea707c2f9a0b0a40
Merge remote-tracking branch 'm68knommu/for-next'

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