]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4b8eebfb9fc1f5ac2416acda109baaaf38d46677
treef76cebe89b2c03afe61046f5a954ac342e977069
parent8d1e3543cb832e34cc5f28bd3140760f485c004d
parent3f74d777625d6db5b6fa95e7065e2f89a6ccc358
parent0bc3c00921da4d867772fcb167e6a1f7f9763126
parent6deed55e132a022627a969b8753bb0bf4393a963
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