From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 10 Aug 2010 22:17:52 +0000 (+0100)
Subject: Merge branches 'master' and 'devel' into for-linus
X-Git-Tag: v2.6.36-rc1~102^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b019a41553a919965bb02d07d54e3e6c57a796d;p=pandora-kernel.git

Merge branches 'master' and 'devel' into for-linus

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig
---

0b019a41553a919965bb02d07d54e3e6c57a796d
Reading git-diff-tree failed