Merge branch 'master-sync' of git://git.denx.de/u-boot-arm