| commit | 7e0cac630c7c90f12a78131df9913657fa30243b | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 14:24:28 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 14:24:28 2011 +0100 |
| tree | c09aa76b07a9bcb0ab0dea4885909421f7a9f4a6 | |
| parent | 94314a40bcc537c396012e37cf887572f0d82aef [diff] | |
| parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 [diff] |
Merge branch 'imx/devel' into imx/imx6q Conflicts: arch/arm/plat-mxc/include/mach/memory.h