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

Merge branch 'imx/pinctrl' into imx/dt

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 some simply but annoying conflicts.

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

6b204283f2802a92cf91fc14c2c1b04e7295761b
Reading git-diff-tree failed