From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 15 Mar 2011 16:32:47 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... 
X-Git-Tag: v2.6.39-rc1~434^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ced9f03d12d7539e86b0bff5bc750153c976c34;p=pandora-kernel.git

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

Conflicts:
	arch/arm/mm/Kconfig
---

9ced9f03d12d7539e86b0bff5bc750153c976c34
Reading git-diff-tree failed