From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 11 Oct 2012 01:35:53 +0000 (+1100)
Subject: Merge remote-tracking branch 'ixp4xx/next'
X-Git-Tag: next-20121011~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2c94d519115ddac37d45052e2ae7687991561fbe;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
---

2c94d519115ddac37d45052e2ae7687991561fbe