Merge branch 'for-rmk' of git://git.marvell.com/orion
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 5 Mar 2009 09:21:18 +0000 (09:21 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Mar 2009 09:21:18 +0000 (09:21 +0000)

Trivial merge