| commit | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Nov 01 17:12:22 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Nov 01 17:12:22 2011 +0100 |
| tree | 7a0ebba8b14d889a8b42edfa1272be222b908a82 | |
| parent | 7e1efcf5d2039fb7a91e21df32f4175dbca4d61c [diff] | |
| parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 [diff] |
Merge branch 'imx/devel' into next/dt The board changes in the imx/devel branch conflict with other changes in the device imx/dt branch. Conflicts: arch/arm/mach-mx5/board-mx53_loco.c arch/arm/mach-mx5/board-mx53_smd.c arch/arm/plat-mxc/include/mach/common.h arch/arm/plat-mxc/include/mach/memory.h Signed-off-by: Arnd Bergmann <arnd@arndb.de>