From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 16 Mar 2011 23:35:26 +0000 (+0000)
Subject: Merge branch 'v6v7' into devel
X-Git-Tag: v2.6.39-rc1~463^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd1274dc005c2cee41771a7cc616f4709a6e6323;p=pandora-kernel.git

Merge branch 'v6v7' into devel

Conflicts:
	arch/arm/include/asm/cacheflush.h
	arch/arm/include/asm/proc-fns.h
	arch/arm/mm/Kconfig
---

bd1274dc005c2cee41771a7cc616f4709a6e6323
Reading git-diff-tree failed