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: v2.6.30-rc1~636^2~18
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7d83f8fca517b123cf0136503a9e50974f65ec49;p=linux.git

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

Conflicts:

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

7d83f8fca517b123cf0136503a9e50974f65ec49