]> 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 00:15:12 +0000 (11:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 00:15:12 +0000 (11:15 +1100)
commitf54652eec6bf7482e2e25accb2b2a62733e34c97
tree9a0431a4e0d31ee4e32faf1b69a8a0972f3e7df8
parent796874939945f3cca50e6e150f8316d33028d353
parent285aa9405cdcd9c98dd85a9a664af040d9f228f5
Merge remote-tracking branch 'm68knommu/for-next'

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