Skip to content
Commit 27f33e9f authored by Bartlomiej Sieka's avatar Bartlomiej Sieka
Browse files

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: default avatarBartlomiej Sieka <tur@semihalf.com>
parents 18e69a35 388b82fd
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment