From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 19 Mar 2009 23:10:40 +0000 (+0000)
Subject: Merge branch 'master' of git://git.marvell.com/orion into devel
X-Git-Tag: firefly_0821_release~15211^2~18
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7d83f8fca517b123cf0136503a9e50974f65ec49;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of git://git.marvell.com/orion into devel

Conflicts:

	arch/arm/mach-mx1/devices.c
---

7d83f8fca517b123cf0136503a9e50974f65ec49