Merge branch 'pci'

diff --cc CHANGELOG
index 6dc76d2,761f3a4..1aa8f31
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,19 -2,19 +2,32 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Report back PCI bus when doing table based device config
+   Patch by Kumar Gala 11 Jan 2006
+ 
+ * Added support for PCI prefetchable region and BARs
+   If a host controller sets up a region as prefetchable and
+   a device's BAR denotes it as prefetchable, allocate the
+   BAR into the prefetch region.
+ 
+   If a BAR is prefetchable and no prefetchable region has
+   been setup by the controller we fall back to allocating
+   the BAR into the normally memory region.
+   Patch by Kumar Gala 11 Jan 2006
+ 
 +* Only disable the MPC83xx watchdog if its enabled out of reset.
 +  If its disabled out of reset SW can later enable it if so desired
 +  Patch by Kumar Gala, 11 Jan 2006
 +
 +* Allow config of GPIO direction & data registers at boot on 83xx
 +  Patch by Kumar Gala, 11 Jan 2006
 +
 +* Enable time handling on 83xx
 +  Patch by Kumar Gala, 11 Jan 2006
 +
 +* Make System IO Config Registers board configurable on MPC83xx
 +  Patch by Kumar Gala, 11 Jan 2006
 +
  * Add support for 28F256J3A flah (=> 64 MB) on PM520 board
  
  * Fix compiler problem with at91rm9200dk board.