From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 4 Nov 2011 01:27:43 +0000 (+1100)
Subject: Merge remote-tracking branch 'm68knommu/for-next'
X-Git-Tag: next-20111104~65
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=648a67a7f73ab5ea416658571eeb26068c46d6fd;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
---

648a67a7f73ab5ea416658571eeb26068c46d6fd