From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 6 Nov 2011 23:50:27 +0000 (+1100)
Subject: Merge remote-tracking branch 'm68knommu/for-next'
X-Git-Tag: next-20111107~56
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f48c60493504d65ac174f2a8b4ceb4204dd392ae;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
---

f48c60493504d65ac174f2a8b4ceb4204dd392ae