Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq...
authorSascha Hauer <s.hauer@pengutronix.de>
Thu, 29 Sep 2011 08:40:29 +0000 (10:40 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Thu, 29 Sep 2011 08:40:29 +0000 (10:40 +0200)
commitca4e419c20bd4dfc8f4e6af5a4ec3928b21e76a3
treef76cebe89b2c03afe61046f5a954ac342e977069
parente93aabb5522be0a42b95be4ca91ef8f530c26975
parent6132ae8154f923b9064e2d8900b10eed498f2c42
parent318007e9001349db9b4fcd49e9e79a7636dba7a9
parent05822c83d2839b28c541eebc9f8be6da3a0b6a83
Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features

Conflicts:
arch/arm/plat-mxc/avic.c
arch/arm/plat-mxc/include/mach/common.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
12 files changed:
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/mach-mx25_3ds.c
arch/arm/mach-imx/mach-mx31moboard.c
arch/arm/mach-imx/mach-qong.c
arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/board-mx51_efikasb.c
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/mx51_efika.c
arch/arm/plat-mxc/avic.c
arch/arm/plat-mxc/include/mach/common.h
arch/arm/plat-mxc/include/mach/mx25.h
arch/arm/plat-mxc/tzic.c