]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Nov 2011 01:22:12 +0000 (12:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Nov 2011 01:22:12 +0000 (12:22 +1100)
commit3d74475aa42569357230dc4b43057847fb7c7db7
treefb384bf4cd8f12af7e8549c230b364e96ed0c2be
parent3a8fba7286d0c22be555b19fa822b37888b58262
parent0ada06b33b95fedca884cc06386843c4ffc22e8c
Merge remote-tracking branch 'm68knommu/for-next'

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