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: firefly_0821_release~9833^2~1326^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e910b63d009701ad4ebbeb089aba35707fa5d68e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'l7200' into devel

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

e910b63d009701ad4ebbeb089aba35707fa5d68e