| commit | 4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon May 14 15:30:52 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon May 14 15:30:52 2012 +0200 |
| tree | ac23c7b80154a476db3882d92f079c50c919e2fa | |
| parent | c818f97bc3266f0fbf619f2348d951272f8ac335 [diff] | |
| parent | a0f5e3631b07cabf624e7d818df76d47d9d21017 [diff] |
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>