From: Wolfgang Denk <wd@denx.de>
Date: Mon, 13 Feb 2012 22:15:25 +0000 (+0100)
Subject: Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
X-Git-Tag: v2012.04-rc1~157
X-Git-Url: https://git.librecmc.org/?p=oweals%2Fu-boot.git;a=commitdiff_plain;h=e9d44b35beb45869863f3ca6929089d9df4df3e5

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

* 'sf' of git://git.denx.de/u-boot-blackfin:
  README: Add description of SPI Flash (SF) command configuration
  sf command: allow default bus and chip selects
  sf: eeprom_m95xxx: set a sane default timeout
  sf: eeprom_m95xxx: fix up style
---

e9d44b35beb45869863f3ca6929089d9df4df3e5