Merge branch 'for-rmk' of git://git.marvell.com/orion
authorRussell King <[email protected]>
Wed, 27 Jan 2010 22:16:05 +0000 (22:16 +0000)
committerRussell King <[email protected]>
Wed, 27 Jan 2010 22:16:05 +0000 (22:16 +0000)

Trivial merge