From: Wolfgang Denk Date: Mon, 3 Sep 2012 19:22:12 +0000 (+0200) Subject: Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash X-Git-Tag: v2025.01-rc5-pxa1908~17316 X-Git-Url: http://git.dujemihanovic.xyz/html/index.html?a=commitdiff_plain;h=f499131867de260c09ad0fafd7dbc3bb5fda3eb4;p=u-boot.git Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash * 'master' of git://git.denx.de/u-boot-cfi-flash: cfi: Make the flash erase and write operations abortable cfi: Check for blank before erase Signed-off-by: Wolfgang Denk --- f499131867de260c09ad0fafd7dbc3bb5fda3eb4