From: Wolfgang Denk <wd@denx.de>
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: v2012.10-rc1~58
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f499131867de260c09ad0fafd7dbc3bb5fda3eb4;p=kernel%2Fu-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 <wd@denx.de>
---

f499131867de260c09ad0fafd7dbc3bb5fda3eb4