Merge with /home/sr/git/u-boot/avr32

diff --cc CHANGELOG
index 9486f0d3f237dccfc2189544f357d7da721d7873,e3ab62138dd41e302de72f05ca063950a2db118d..a2ea35d68e3a9c5fc3a95213adfa724568ff0208
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,9 -2,11 +2,14 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Define IH_CPU_AVR32
+   Make it possible to generate AVR32 uImage files with mkimage and
+   make cmd_bootm recognize them.
+   Patch by Haavard Skinnemoen, 22 Sep 2006
+ 
 +* Fix buffer overflow problem in ft_build.c
 +  Patch by Fredrik Roubert, 09 Oct 2006
 +
  * Make bootp implementation RFC3046 compliant
    Patch by Joakim Larsson, 27 Jun 2006