summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx5
diff options
context:
space:
mode:
authorSascha Hauer2011-09-20 10:09:08 +0200
committerSascha Hauer2011-09-20 10:09:08 +0200
commit6da5ce1728e3058312b6cf36786189002de1407d (patch)
tree47df7114d1d3057461a40ce277052f6caabad5cb /arch/arm/mach-mx5
parentMerge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'clean... (diff)
parentARM: mach-mxs/mx28evk: Only register devices if their GPIO requests succeeded (diff)
parentARM: mx5/mm: consolidate TZIC map code (diff)
downloadkernel-qcow2-linux-6da5ce1728e3058312b6cf36786189002de1407d.tar.gz
kernel-qcow2-linux-6da5ce1728e3058312b6cf36786189002de1407d.tar.xz
kernel-qcow2-linux-6da5ce1728e3058312b6cf36786189002de1407d.zip
Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup
Conflicts: arch/arm/mach-mx5/Makefile Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>