-
git://www.denx.de/git/u-boot-testing由 Bartlomiej Sieka 提交于
Conflicts: common/cmd_bootm.c cpu/mpc8xx/cpu.c Signed-off-by: NBartlomiej Sieka <tur@semihalf.com>27f33e9f
Conflicts:
common/cmd_bootm.c
cpu/mpc8xx/cpu.c
Signed-off-by: NBartlomiej Sieka <tur@semihalf.com>