Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
authorBartlomiej Sieka <tur@semihalf.com>
Wed, 26 Mar 2008 08:38:06 +0000 (09:38 +0100)
committerBartlomiej Sieka <tur@semihalf.com>
Wed, 26 Mar 2008 08:38:06 +0000 (09:38 +0100)
commit27f33e9f45ef7f9685cbdc65066a1828e85dde4f
tree5828044d71e5caa3bec4d05c6c48793df0cd17a3
parent18e69a35efbb078403db0c0063986470dad7d082
parent388b82fddc7c05596f3f615f190da0448227dc82
Merge branch 'new-image' of git://denx.de/git/u-boot-testing

Conflicts:

common/cmd_bootm.c
cpu/mpc8xx/cpu.c

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
Makefile
README
board/cray/L1/L1.c
common/Makefile
common/cmd_bootm.c
cpu/mpc5xxx/cpu.c
fs/cramfs/uncompress.c
include/common.h
libfdt/fdt.c
libfdt/fdt_ro.c
libfdt/fdt_rw.c