]> 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, 18 Nov 2011 00:23:52 +0000 (11:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 00:23:52 +0000 (11:23 +1100)
commitcae5b34cc5bbc1bec631e9eaf6a9228f2b9aa78b
tree7da845afe4461026834d048fd2f4e991954f5ce7
parenta4436f0d5d1b767f5fe2f94f85adeb48c89f6834
parentd0bf61cd041c4aff8d3742e18b5e474747914beb
Merge remote-tracking branch 'm68knommu/for-next'

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