Solve the copyright conflicts when merging 'master' into hpc2.

Merge branch 'master' into hpc2

Conflicts:

	drivers/cfi_flash.c

diff --cc MAKEALL
Simple merge

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc drivers/cfi_flash.c
index 33a5822d90a6cf9d7e0e4211bc4d319df47c9900,9b10220fc74520e48befc9a4d2b8664f1337494d..8f959e72a2741faa50761a5bffa32b60f5a7fe3e
--- 1/drivers/cfi_flash.c
--- 2/drivers/cfi_flash.c
+++ b/drivers/cfi_flash.c
@@@ -2,12 -2,8 +2,8 @@@
   * (C) Copyright 2002-2004
   * Brad Kemp, Seranoa Networks, Brad.Kemp@seranoa.com
   *
 - * Copyright (C) 2003 Arabella Software Ltd.
 + * Copyright (C) 2003, 2006 Arabella Software Ltd.
   * Yuli Barcohen <yuli@arabellasw.com>
-  * Modified to work with AMD flashes
-  * Added support for byte lanes swap
-  * Added support for 32-bit chips consisting of two 16-bit devices
-  * (for example, S70GL256M00)
   *
   * Copyright (C) 2004
   * Ed Okerson
@@@ -67,20 -50,12 +53,16 @@@
   * JEDEC Standard JEP137-A Common Flash Interface (CFI) ID Codes
   * Intel Application Note 646 Common Flash Interface (CFI) and Command Sets
   * Intel 290667-008 3 Volt Intel StrataFlash Memory datasheet
+  * AMD CFI Specification, Release 2.0 December 1, 2001
+  * AMD/Spansion Application Note: Migration from Single-byte to Three-byte
+  *   Device IDs, Publication Number 25538 Revision A, November 8, 2001
   *
-  * TODO
-  *
-  * Use Primary Extended Query table (PRI) and Alternate Algorithm Query
-  * Table (ALT) to determine if protection is available
-  *
-  * Add support for other command sets Use the PRI and ALT to determine command set
-  * Verify erase and program timeouts.
   */
  
 +#if defined(__LITTLE_ENDIAN) && !defined(CFG_FLASH_CFI_SWAP)
 +#define CFG_FLASH_CFI_SWAP
 +#endif
 +
  #ifndef CFG_FLASH_BANKS_LIST
  #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
  #endif