Merge branch 'for-rmk' of git://git.marvell.com/orion
Russell King [Mon, 16 Nov 2009 16:28:15 +0000 (16:28 +0000)]

Trivial merge