]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 6 Nov 2011 23:50:27 +0000 (10:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 6 Nov 2011 23:50:27 +0000 (10:50 +1100)
commitf48c60493504d65ac174f2a8b4ceb4204dd392ae
treea128c86774bfa2f1169703d6a165a2cf2e2f009b
parentd07824eaf801915efc3d73123d6e0a556c120aed
parent0ada06b33b95fedca884cc06386843c4ffc22e8c
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/Kconfig.bus
arch/m68k/Kconfig.devices
arch/m68k/kernel/Makefile