Merge branch 'master' of boot/u-boot-linaro-stable