Arnd Bergmann 6b204283f2 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>

2012-05-14 15:23:13 +02:00

..

bootp

ARM: 6499/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S

2010-11-30 13:44:24 +00:00

compressed

ARM: 7380/1: DT: do not add a zero-sized memory property

2012-04-13 14:05:41 +01:00

dts

Merge branch 'imx/pinctrl' into imx/dt

2012-05-14 15:23:13 +02:00

.gitignore

ARM: devicetree: Add .dtb files to arch/arm/boot/.gitignore

2012-01-30 11:47:37 -07:00

install.sh

kbuild: use INSTALLKERNEL to select customized installkernel script

2009-09-20 12:18:14 +02:00

Makefile

Kbuild: centralize MKIMAGE and cmd_uimage definitions

2012-03-26 15:49:20 +02:00