diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:23:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:23:13 +0200 |
| commit | 6b204283f2802a92cf91fc14c2c1b04e7295761b (patch) | |
| tree | e323818ac7f159c13f646fdf75bf0f016d7ae368 /arch/arm/mach-pxa/time.c | |
| parent | ARM: dts: imx53-qsb: enable audio support (diff) | |
| parent | ARM: mxs: enable pinctrl support (diff) | |
| download | linux-6b204283f2802a92cf91fc14c2c1b04e7295761b.tar.xz linux-6b204283f2802a92cf91fc14c2c1b04e7295761b.zip | |
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>
Diffstat (limited to 'arch/arm/mach-pxa/time.c')
0 files changed, 0 insertions, 0 deletions