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

Merge branch 'misc' into devel

Conflicts:
	arch/arm/mm/init.c
---

ceb0885d3b01bb2e2f18765770e212914f2864be
Reading git-diff-tree failed