From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 14 May 2012 13:30:52 +0000 (+0200)
Subject: Merge branch 'imx/pinctrl' into imx/clock
X-Git-Tag: v3.5-rc1~71^2~1^3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1;p=pandora-kernel.git

Merge branch 'imx/pinctrl' into imx/clock

Conflicts:
	drivers/mmc/host/sdhci-esdhc-imx.c
	drivers/net/ethernet/freescale/fec.c
	drivers/spi/spi-imx.c
	drivers/tty/serial/imx.c

This resolves dependencies between the pinctrl and clock changes
in imx.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1
Reading git-diff-tree failed