Merge branch 'mpc8349ads'

[oweals/u-boot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 28133baabf1b41b30ae2305bda36a54a6979ab12..2d6ce103d95f4bcc263956ffa512a5dc8efa9b4c 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
 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