Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 20 Oct 2008 22:06:15 +0000 (23:06 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 20 Oct 2008 22:06:15 +0000 (23:06 +0100)

Trivial merge