From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 9 Aug 2010 13:07:19 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... 
X-Git-Tag: v2.6.36-rc1~102^2^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2192482ee5ce5d5d4a6cec0c351b2d3a744606eb;p=pandora-kernel.git

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

Conflicts:
	arch/arm/Kconfig
---

2192482ee5ce5d5d4a6cec0c351b2d3a744606eb
Reading git-diff-tree failed