From: Wolfgang Denk <wd@denx.de>
Date: Sat, 11 Feb 2012 21:16:47 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
X-Git-Tag: v2012.04-rc1~256^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7100a54604442176dc1785a7644f3df8c85d6c55;p=pandora-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:
  add STM29F400BB to table of supported legacy flashs
  * Fix: watchdog timed out, if flash blank (0xFF) blocks
---

7100a54604442176dc1785a7644f3df8c85d6c55