]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:31:49 +0000 (11:31 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:31:49 +0000 (11:31 +1100)
commit04433fc471aebbd08e6498c7f9904d350ae6c44b
tree12d93f14bc53b27a4a100cff375d4d2677a23792
parentd28d12bf233e8d55350f552b5c9c81f6903c00a5
parent4a7c080c3e53e9e0a29b3d7e2ef5a65fb0d94d92
Merge remote-tracking branch 'm68knommu/for-next'

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