Merge branch 'for-rmk' of git://git.marvell.com/orion
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 9 Jul 2009 15:08:14 +0000 (16:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 9 Jul 2009 15:08:14 +0000 (16:08 +0100)

Trivial merge