From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 25 May 2011 20:47:48 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... 
X-Git-Tag: v3.0-rc1~34^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=586893ebc42943008010b4c210cfc9167df615e5;p=pandora-kernel.git

Merge branch 'for-rmk' of git://git./linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-exynos4/mach-nuri.c
---

586893ebc42943008010b4c210cfc9167df615e5
Reading git-diff-tree failed