tree a22530bb2da510f0671b72cbd9c18531b13fae68
parent e66443fdb5355e68cfdbbdd37248c4b7eb4968f5
parent 4a4cb4e11149158c9eabb1537a1eaee7372ce491
author Wolfgang Denk <wd@denx.de> 1346494951 +0200
committer Wolfgang Denk <wd@denx.de> 1346494951 +0200

Merge branch 'sf' of git://git.denx.de/u-boot-blackfin

* 'sf' of git://git.denx.de/u-boot-blackfin:
  sf: spansion: Add support for S25FL256S
  sf: winbond: fix page_size
  sf: stmicro: add support for N25Q128A
  sf: stmicro: add support N25Q128 parts
  sf: stmicro: support JEDEC standard two-byte signature
  sf: winbond: add W25Q32
  cmd_spi: remove superfluous semicolon

Signed-off-by: Wolfgang Denk <wd@denx.de>