From: Wolfgang Denk <wd@denx.de>
Date: Sat, 11 Feb 2012 21:16:50 +0000 (+0100)
Subject: Merge branch 'master' of /home/wd/git/u-boot/custodians
X-Git-Tag: v1.2~33^2~97
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=e3b36210224f07cc798fef15e83db3500529c7bb

Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  add STM29F400BB to table of supported legacy flashs
  * Fix: watchdog timed out, if flash blank (0xFF) blocks
---

e3b36210224f07cc798fef15e83db3500529c7bb