Merge branch 'for-rmk' of git://git.marvell.com/orion
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 8 Nov 2009 16:40:38 +0000 (16:40 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 8 Nov 2009 16:40:38 +0000 (16:40 +0000)

Trivial merge