]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'm68knommu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:30:56 +0000 (13:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:30:56 +0000 (13:30 +1100)
commitce1fe23670feb866d321766c53d9d9d8b0e12c99
tree243706be01d63dd78e7e822eeed9e51da926872e
parent0b18568fc7b70743fa08fa9819ad25728c04a737
parent0ada06b33b95fedca884cc06386843c4ffc22e8c
Merge remote-tracking branch 'm68knommu/for-next'

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