From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 27 Sep 2012 05:57:27 +0000 (+1000)
Subject: Merge remote-tracking branch 'ixp4xx/next'
X-Git-Tag: next-20120927~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8e626d52dca323b6a89001d8f7b493569af51d73;p=karo-tx-linux.git

Merge remote-tracking branch 'ixp4xx/next'

Conflicts:
	arch/arm/mach-ixp4xx/common.c
	arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
---

8e626d52dca323b6a89001d8f7b493569af51d73