From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 2 Mar 2010 23:31:07 +0000 (+0000)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
X-Git-Tag: v2.6.34-rc2~66^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39;p=pandora-kernel.git

Merge /linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
	arch/arm/Kconfig
---

64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39
Reading git-diff-tree failed