From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 31 Jul 2010 13:20:16 +0000 (+0100)
Subject: Merge branch 'devel-stable' into devel
X-Git-Tag: v2.6.36-rc1~591^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b70c4275f28702b76b273c8534c38f8313812e9;p=pandora-kernel.git

Merge branch 'devel-stable' into devel

Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/kernel/setup.c
	arch/arm/mm/init.c
---

7b70c4275f28702b76b273c8534c38f8313812e9
Reading git-diff-tree failed