| commit | 27f33e9f45ef7f9685cbdc65066a1828e85dde4f | [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 | 18e69a35efbb078403db0c0063986470dad7d082 [diff] | |
| parent | 388b82fddc7c05596f3f615f190da0448227dc82 [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>