From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 23 May 2011 18:28:04 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-linus
X-Git-Tag: v3.0-rc1~328^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0;p=pandora-kernel.git

Merge branch 'devel-stable' into for-linus

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-ns9xxx/include/mach/uncompress.h
---

9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0
Reading git-diff-tree failed