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

diff --cc CHANGELOG
index bd46c8c,197af8d..5e6e1f3
--- 1/CHANGELOG
--- 2/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