Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Sat, 11 Feb 2012 21:16:50 +0000 (22:16 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 11 Feb 2012 21:16:50 +0000 (22:16 +0100)
* '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


Trivial merge