Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Feb 2010 21:20:18 +0000 (21:20 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Feb 2010 21:20:18 +0000 (21:20 +0000)
Conflicts:
arch/arm/Makefile


Trivial merge