Merge with /home/wd/git/u-boot/master

diff --cc CHANGELOG
index a491ec060e9f8b58aa2189c54bfb0b2e65273783,ef3b807f148f67ed1c8cbda439521ab896522d95..ad5f7a32e9110674b24b10acd64a177c5331fdfa
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,8 -2,12 +2,14 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
 +* Fix lowboot support on MCC200 board
 +
+ * Merged MPC8349ADS and MPC8349EMDS ports into MPC8349EMDS port:
+   - Removed MPC8349ADS port
+   - Added PCI support to MPC8349ADS
+   - reworked memory map to allow mapping of all regions with BATs
+   Patch by Kumar Gala 20 Apr 2006
+ 
  * Coding Style cleanup
  
  * Write RTC seconds first to maintain settings integrity per