summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx5/board-mx51_efikamx.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-09-29 10:40:29 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-09-29 10:40:29 +0200
commitca4e419c20bd4dfc8f4e6af5a4ec3928b21e76a3 (patch)
treef76cebe89b2c03afe61046f5a954ac342e977069 /arch/arm/mach-mx5/board-mx51_efikamx.c
parentMerge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata... (diff)
parentARM: mx25: Add the missing IIM base definition (diff)
parentFix pata imx resource (diff)
parentARM i.MX entry-macro.S: remove now unused code (diff)
downloadlinux-ca4e419c20bd4dfc8f4e6af5a4ec3928b21e76a3.tar.xz
linux-ca4e419c20bd4dfc8f4e6af5a4ec3928b21e76a3.zip
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>