| commit | 6da5ce1728e3058312b6cf36786189002de1407d | [log] [tgz] |
|---|---|---|
| author | Sascha Hauer <s.hauer@pengutronix.de> | Tue Sep 20 10:09:08 2011 +0200 |
| committer | Sascha Hauer <s.hauer@pengutronix.de> | Tue Sep 20 10:09:08 2011 +0200 |
| tree | 47df7114d1d3057461a40ce277052f6caabad5cb | |
| parent | 04871e934818988c1da318ec0a15f87065cd1ca2 [diff] | |
| parent | a35b91474c329ecefa793e4e7bb4103c88f4a16f [diff] | |
| parent | 4c54239058772160da123167de89603830815a88 [diff] |
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>