Merge remote branch 'u-boot-nand-flash/master'