Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 20:41:34 +0000 (20:41 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 20:41:34 +0000 (20:41 +0000)

Trivial merge