Merge with git://git.kernel.org/pub/scm/boot/u-boot/u-boot.git#mpc83xx