Merge branch 'for-rmk' of git://git.marvell.com/orion
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 5 May 2009 08:22:05 +0000 (09:22 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 5 May 2009 08:22:05 +0000 (09:22 +0100)

Trivial merge