Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 8 Jun 2009 18:27:13 +0000 (19:27 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 8 Jun 2009 18:27:13 +0000 (19:27 +0100)

Trivial merge