Merge branch 'for-rmk' of git://git.marvell.com/orion
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 Jan 2010 22:16:05 +0000 (22:16 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 Jan 2010 22:16:05 +0000 (22:16 +0000)

Trivial merge