Pileus Git - ~andy/linux/commit

]> Pileus Git - ~andy/linux/commit

author	Arnd Bergmann <arnd@arndb.de>
	Mon, 14 May 2012 13:23:13 +0000 (15:23 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Mon, 14 May 2012 13:23:13 +0000 (15:23 +0200)
commit	6b204283f2802a92cf91fc14c2c1b04e7295761b
tree	e323818ac7f159c13f646fdf75bf0f016d7ae368	tree \| snapshot
parent	ffc505c0b99d6caf5b10d813f9a0ce3576f68996	commit \| diff
parent	a0f5e3631b07cabf624e7d818df76d47d9d21017	commit \| 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>

Andy's Linux Kernel repo

RSS Atom

arch/arm/mach-imx/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/imx53-dt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx6q.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mm-imx3.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mm-imx5.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-esdhc-imx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-imx.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/imx.c	diff1 \|	diff2 \|	blob \| history