Merge branch 'for-rmk' of git://git.marvell.com/orion
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 27 Aug 2008 18:30:13 +0000 (19:30 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 Aug 2008 18:30:13 +0000 (19:30 +0100)

Trivial merge