From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 20 Oct 2011 13:14:25 +0000 (+0200)
Subject: Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2... 
X-Git-Tag: v3.2-rc1~89^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4cbb8a4e602ea77b0525d06eff89c6a6070dab3;p=pandora-kernel.git

Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel

Conflicts:
	arch/arm/mach-mx5/clock-mx51-mx53.c
	arch/arm/mach-mx5/devices-imx53.h
---

b4cbb8a4e602ea77b0525d06eff89c6a6070dab3
Reading git-diff-tree failed