From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 19 Oct 2010 19:12:24 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... 
X-Git-Tag: v2.6.37-rc1~184^2~5^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f779b7dd3259ec138c7aba793f0602b20262af83;p=pandora-kernel.git

Merge branch 'for-rmk' of git://git./linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
	arch/arm/mach-at91/include/mach/system.h
	arch/arm/mach-imx/mach-cpuimx27.c

AT91 conflict resolution:
Acked-by: Anders Larsen <al@alarsen.net>
IMX conflict resolution confirmed by Uwe Kleine-König.
---

f779b7dd3259ec138c7aba793f0602b20262af83
Reading git-diff-tree failed