From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Nov 2011 02:12:33 +0000 (+1100)
Subject: Merge remote-tracking branch 'pinctrl/for-next'
X-Git-Tag: next-20111107~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=afbc445720041215d2a08bce61a4ca095fdbaafe;p=karo-tx-linux.git

Merge remote-tracking branch 'pinctrl/for-next'

Conflicts:
	arch/arm/mach-u300/Kconfig
	arch/arm/mach-u300/core.c
---

afbc445720041215d2a08bce61a4ca095fdbaafe