From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 17 May 2010 16:24:04 +0000 (+0100)
Subject: Merge branch 'devel-stable' into devel
X-Git-Tag: v2.6.35-rc1~503^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac1d426e825ab5778995f2f6f053ca2e6b45c622;p=pandora-kernel.git

Merge branch 'devel-stable' into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/system.h
	arch/arm/mm/Kconfig
---

ac1d426e825ab5778995f2f6f053ca2e6b45c622
Reading git-diff-tree failed