Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'