| commit | 6b204283f2802a92cf91fc14c2c1b04e7295761b | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon May 14 15:23:13 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon May 14 15:23:13 2012 +0200 |
| tree | e323818ac7f159c13f646fdf75bf0f016d7ae368 | |
| parent | ffc505c0b99d6caf5b10d813f9a0ce3576f68996 [diff] | |
| parent | a0f5e3631b07cabf624e7d818df76d47d9d21017 [diff] |
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>