diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-09-20 10:09:08 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-09-20 10:09:08 +0200 |
| commit | 6da5ce1728e3058312b6cf36786189002de1407d (patch) | |
| tree | 47df7114d1d3057461a40ce277052f6caabad5cb | |
| parent | Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'clean... (diff) | |
| parent | ARM: mach-mxs/mx28evk: Only register devices if their GPIO requests succeeded (diff) | |
| parent | ARM: mx5/mm: consolidate TZIC map code (diff) | |
| download | linux-6da5ce1728e3058312b6cf36786189002de1407d.tar.xz 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>