1313a
author Russell King <rmk+kernel@arm.linux.org.uk> 1266268818 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1266268818 +0000

Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable

Conflicts:
	arch/arm/Makefile
2¹wÕ—1x