Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Mon, 3 Sep 2012 19:22:12 +0000 (21:22 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 3 Sep 2012 19:22:12 +0000 (21:22 +0200)
commitf499131867de260c09ad0fafd7dbc3bb5fda3eb4
tree58c3e51745db59d367200c2f55c642617ce30cfe
parent6c43d11f3db5289398f882fc9d4158c5abe3a344
parentde15a06aad1f221255366ac07238c80fed146da1
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>