From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 02:30:56 +0000 (+1100)
Subject: Merge remote-tracking branch 'm68knommu/for-next'
X-Git-Tag: next-20111103~68
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ce1fe23670feb866d321766c53d9d9d8b0e12c99;p=karo-tx-linux.git

Merge remote-tracking branch 'm68knommu/for-next'

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

ce1fe23670feb866d321766c53d9d9d8b0e12c99