summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-01-12 19:53:39 -0600
committerKumar Gala <galak@kernel.crashing.org>2006-01-12 19:53:39 -0600
commitb443f7b628bf9e9ba9cd93589c1fea8b908edd22 (patch)
tree793245b970d33b892d251558e494c236e5dd842e /CHANGELOG
parent06508f1c9b35ed16f42b3dfe99f9b1182b4ec82e (diff)
parent86902b8e36f86c8675be6b759c2a8ced50805f64 (diff)
downloadu-boot-imx-b443f7b628bf9e9ba9cd93589c1fea8b908edd22.zip
u-boot-imx-b443f7b628bf9e9ba9cd93589c1fea8b908edd22.tar.gz
u-boot-imx-b443f7b628bf9e9ba9cd93589c1fea8b908edd22.tar.bz2
Merge branch 'mpc8349ads'
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2d6ce10..28133ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,6 @@
Changes since U-Boot 1.1.4:
======================================================================
-<<<<<<< HEAD/CHANGELOG
* Fixed PCI indirect config ops to handle multiple PCI controllers
We need to adjust the bus number we are trying to access based
on which PCI controller its on