From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 2 Mar 2010 23:40:15 +0000 (+0000)
Subject: Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
X-Git-Tag: v2.6.34-rc2~66^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=882d01f96bc1909455696aae6eb7ce4df3e908c8;p=pandora-kernel.git

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

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
---

882d01f96bc1909455696aae6eb7ce4df3e908c8
Reading git-diff-tree failed