Merge branch 'for-rmk' of git://git.marvell.com/orion
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 16 Dec 2009 20:06:20 +0000 (20:06 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 16 Dec 2009 20:06:20 +0000 (20:06 +0000)

Trivial merge