summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-09-20 10:09:08 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-09-20 10:09:08 +0200
commit6da5ce1728e3058312b6cf36786189002de1407d (patch)
tree47df7114d1d3057461a40ce277052f6caabad5cb /arch/arm
parent04871e934818988c1da318ec0a15f87065cd1ca2 (diff)
parenta35b91474c329ecefa793e4e7bb4103c88f4a16f (diff)
parent4c54239058772160da123167de89603830815a88 (diff)
downloadlinux-6da5ce1728e3058312b6cf36786189002de1407d.tar.bz2
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>