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