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