Bartlomiej Sieka 27f33e9f45 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>

2008-03-26 09:38:06 +01:00

..

L1

Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing

2008-03-26 09:38:06 +01:00