From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 12 Sep 2009 11:02:26 +0000 (+0100)
Subject: Merge branch 'devel-stable' into devel
X-Git-Tag: v2.6.32-rc1~691^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3;p=pandora-kernel.git

Merge branch 'devel-stable' into devel

Conflicts:
	MAINTAINERS
	arch/arm/mm/fault.c
---

ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3
Reading git-diff-tree failed