Commits
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>
Showing diff to05822c83d28
Sascha Hauer committed e93aabb5522MMerge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata', 'featur...
Jason Liu committed 6132ae8154fARM: mx25: Add the missing IIM base definition This fix the mx25 building issue of no ...
Arnaud Patard (Rtp) committed 318007e9001Fix pata imx resource Commit 236c4e8be436380b5354fe0d7facf94688e024ec "ARM: imx: Add P...- Sascha Hauer committed 05822c83d28ARM i.MX entry-macro.S: remove now unused code Signed-off-by: Sascha Hauer <s.hauer@pe...