]> 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, 12 Dec 2011 00:05:19 +0000 (11:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:05:19 +0000 (11:05 +1100)
commitb01d17c3e3a97dfc6c0797791bae50969b8a3431
treea5f84fb7af258bc84c146632bd7a6edc10463a84
parentf8814945ec678cb3e471864a489c4b7f0d3df06e
parent1c054ea934da182b1b128c64ea707c2f9a0b0a40
Merge remote-tracking branch 'm68knommu/for-next'

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