Merge with /home/sr/git/u-boot/cfi-flash-fix

diff --cc CHANGELOG
index 2e0a957a665be5fe4e9781b4ef4b98963e72ffc2,8e9115eb75b7fa90d0fa8367a9ad67ed8a004e06..85ae3efbd55c84e90b87b1e8b77a6bacf38574be
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,12 -2,9 +2,15 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Fix problem with flash_get_size() from CFI driver update
+   Patch by Stefan Roese, 1 Mar 2006
+ 
 +* Make CFG_NO_FLASH work on ARM systems
 +  Patch by Markus Klotzbuecher, 27 Feb 2006
 +
 +* Update mcc200 config: Disable PCI and DoC, use 133 MHz IPB clock,
 +  use hush shell.
 +
  * Convert mcc200 to use common CFI flash driver
    Patch by Stefan Roese, 28 Feb 2006