From: Wolfgang Denk <wd@pollux.denx.de>
Date: Sun, 3 Sep 2006 16:13:21 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/master
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fc43de0d4a3903e6e3bfbf2fcab8eab6c739481d;p=project%2Fbcm63xx%2Fu-boot.git

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

fc43de0d4a3903e6e3bfbf2fcab8eab6c739481d
diff --cc CHANGELOG
index bd46c8c3b4,197af8d502..5e6e1f3684
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,9 -2,16 +2,19 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Extended README entry on coding style
+ 
+ * Added another example showing simple interrupt interception.
+ 
+ * Added simple_strtoul(), getenv() and setenv() to the exported functions.
+   Also bumped up ABI version to reflect this change.
+ 
+ * Added interrupt handling capabilities for mpc5xxx processors.
+   Also added Linux like BUG() macros.
+ 
 +* Coding Style cleanup.
 +  Patch by Stefano Babic, 31 Aug 2006
 +
  * Add splashscreen support for MCC200 board.
  
  * Make the serial driver framework work with CONFIG_SERIAL_MULTI