Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Fri, 12 Oct 2018 15:54:13 +0000 (11:54 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 12 Oct 2018 15:54:13 +0000 (11:54 -0400)
1  2 
drivers/mtd/spi/spi_flash.c

Simple merge