From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 24 May 2010 19:34:20 +0000 (+0100)
Subject: Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
X-Git-Tag: v2.6.35-rc1~264^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d472d1a1c82ade81d2854db2ff4c9694ed66612e;p=pandora-kernel.git

Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable

Conflicts:
	arch/arm/Kconfig
---

d472d1a1c82ade81d2854db2ff4c9694ed66612e
Reading git-diff-tree failed