diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:30:52 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:30:52 +0200 |
| commit | 4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1 (patch) | |
| tree | ac23c7b80154a476db3882d92f079c50c919e2fa /drivers/amba | |
| parent | ARM i.MX: remove now unused clock files (diff) | |
| parent | ARM: mxs: enable pinctrl support (diff) | |
| download | linux-4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1.tar.xz linux-4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1.zip | |
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>
Diffstat (limited to 'drivers/amba')
0 files changed, 0 insertions, 0 deletions