]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c43d11 de15a06)
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)
* '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>

Trivial merge
Cloned from git://git.denx.de/u-boot.git