| commit | 9571865e0d32b1bcf8a6625497d1cd5d4bbad354 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Wed Jun 08 23:29:04 2011 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Wed Jun 08 23:29:04 2011 +0200 |
| tree | 314afe1d1b53adbca24e6c3a9cf2c45741cdb4ba | |
| parent | ba5c1228463c19395d1cf4b88d4bae7171fe6d98 [diff] | |
| parent | 84b80856387a72c38586075c9a6795e4face7693 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-arm * 'master' of git://git.denx.de/u-boot-arm: SMDK6400: fix the compiler error imx27lite: Remove local config.mk mx31ads: Fix environment location on flash imx31_litekit: Remove local config.mk mx31litekit: Fix boot with the new relocation scheme. mx31ads: Use the new relocation scheme