Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

diff --combined README
index 20751191bd8253478a8040343688615449d8afc8,b29a0d2581ccc7e0045e3cb77a23d00858f8b559..7c1634580a28c054a8b5f5955bfa62920e944b24
--- 1/README
--- 2/README
+++ b/README
@@@ -153,8 -153,6 +153,8 @@@ Directory Hierarchy
    - at32ap    Files specific to Atmel AVR32 AP CPUs
    - i386      Files specific to i386 CPUs
    - ixp               Files specific to Intel XScale IXP CPUs
 +  - leon2     Files specific to Gaisler LEON2 SPARC CPU
 +  - leon3     Files specific to Gaisler LEON3 SPARC CPU
    - mcf52x2   Files specific to Freescale ColdFire MCF52x2 CPUs
    - mcf5227x  Files specific to Freescale ColdFire MCF5227x CPUs
    - mcf532x   Files specific to Freescale ColdFire MCF5329 CPUs
@@@ -188,7 -186,6 +188,7 @@@
  - lib_mips    Files generic to MIPS    architecture
  - lib_nios    Files generic to NIOS    architecture
  - lib_ppc     Files generic to PowerPC architecture
 +- lib_sparc   Files generic to SPARC   architecture
  - libfdt      Library files to support flattened device trees
  - net         Networking code
  - post                Power On Self Test
@@@ -2043,6 -2040,13 +2043,13 @@@ Configuration Settings
                This option also enables the building of the cfi_flash driver
                in the drivers directory
  
+ - CFG_FLASH_USE_BUFFER_WRITE
+               Use buffered writes to flash.
+ 
+ - CONFIG_FLASH_SPANSION_S29WS_N
+               s29ws-n MirrorBit flash has non-standard addresses for buffered
+               write commands.
+ 
  - CFG_FLASH_QUIET_TEST
                If this option is defined, the common CFI flash doesn't
                print it's warning upon not recognized FLASH banks. This