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