From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 02:16:41 +0000 (+1100)
Subject: Merge remote-tracking branch 's5p/for-next'
X-Git-Tag: next-20111103~75
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c02ffce82ed80d5dcc04180a6bf42c1125fb06ac;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/mach-exynos4/Kconfig
	drivers/gpio/Makefile
---

c02ffce82ed80d5dcc04180a6bf42c1125fb06ac