From: Wolfgang Denk <wd@pollux.(none)>
Date: Wed, 14 Dec 2005 14:05:59 +0000 (+0100)
Subject: Merge with /home/m8/git/u-boot
X-Git-Tag: LABEL_2006_03_12_0025~54
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e43232dee85d17dff4fad7fc8ff2bc5f6b9c7a76;p=u-boot

Merge with /home/m8/git/u-boot
---

e43232dee85d17dff4fad7fc8ff2bc5f6b9c7a76
diff --cc CHANGELOG
index 6f5d847022,217cb0f13d..ac3be077d1
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,13 -2,8 +2,15 @@@
  Changes for U-Boot 1.1.4:
  ======================================================================
  
+ * Change port configuration for O2DNT (CODEC1 on PSC1).
+ 
 +* Fix register for PCI async mode on PPC440EP
 +  Patch by Youngchul Bang, 08 Dec 2005
 +
 +* Fix U-Boot linking problems (add .eh_frame segment to linker script)
 +  This segment may be required by some libgcc.a functions
 +  (like _udivdi3).
 +
  * Fix DPRAM offset/size for MPC8541/8555.
    Simplify TQM85xx Makefile handling.