Merge branch 'next' of git://www.denx.de/git/u-boot-cfi-flash into next