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