From: Wolfgang Denk <wd@denx.de>
Date: Sat, 1 Sep 2012 10:22:31 +0000 (+0200)
Subject: Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
X-Git-Tag: v2012.10-rc1~368
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-u-boot.git;a=commitdiff_plain;h=c51261e8dbf9a02859a7f6008c973880316af069

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>
---

c51261e8dbf9a02859a7f6008c973880316af069