| commit | 9eede9b244672e668e12d63ef0787e8a7a21ac0f | [log] [tgz] |
|---|---|---|
| author | Bartlomiej Sieka <tur@semihalf.com> | Wed Mar 26 09:38:06 2008 +0100 |
| committer | Bartlomiej Sieka <tur@semihalf.com> | Wed Mar 26 09:38:06 2008 +0100 |
| tree | 5828044d71e5caa3bec4d05c6c48793df0cd17a3 | |
| parent | 07e6091c861903a96e50e0c66f517f80b92ec4db [diff] | |
| parent | 183fe0a4f26ad0a9fb35bacdffe54ad3620ca987 [diff] |
Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing Conflicts: common/cmd_bootm.c cpu/mpc8xx/cpu.c Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>