From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 22 Jul 2011 22:09:07 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-next
X-Git-Tag: v3.1-rc1~258^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ad55155b222f2a901405dea20ff7c68828ecd92;p=pandora-kernel.git

Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/kernel/entry-armv.S
---

3ad55155b222f2a901405dea20ff7c68828ecd92
Reading git-diff-tree failed