From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Oct 2012 02:06:59 +0000 (+1100)
Subject: Merge remote-tracking branch 'ixp4xx/next'
X-Git-Tag: next-20121008~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=56ade9ae6f33d19d426b6e4e7d72518d825d77ac;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
---

56ade9ae6f33d19d426b6e4e7d72518d825d77ac