From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 16 Jul 2010 10:08:33 +0000 (+0100)
Subject: Merge branch 'l7200' into devel
X-Git-Tag: v2.6.36-rc1~591^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e910b63d009701ad4ebbeb089aba35707fa5d68e;p=pandora-kernel.git

Merge branch 'l7200' into devel

Conflicts:
	arch/arm/configs/lusl7200_defconfig
---

e910b63d009701ad4ebbeb089aba35707fa5d68e
Reading git-diff-tree failed