Merge branch 'master' of git://git.denx.de/u-boot into sunxi-current