From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 15 Feb 2010 21:20:18 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
X-Git-Tag: v2.6.34-rc2~66^2~53
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56012808f4d5606e401539f663d92009d964425b;p=pandora-kernel.git

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

Conflicts:
	arch/arm/Makefile
---

56012808f4d5606e401539f663d92009d964425b
Reading git-diff-tree failed