From: Wolfgang Denk <wd@pollux.denx.de>
Date: Mon, 26 Jun 2006 08:56:16 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/master
X-Git-Tag: v1.3.0-rc3~21^2~25^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a11f778d76d96463fd8ae9e992afea98a1523a97;p=kernel%2Fu-boot.git

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

a11f778d76d96463fd8ae9e992afea98a1523a97
diff --cc CHANGELOG
index efdf30e,e008c04..63b81d6
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,20 -2,8 +2,22 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
 +* Code cleanup
 +
 +* Various USB related patches
 +  - Add support for mpc8xx USB device.
 +  - Add support for Common Device Class - Abstract Control Model USB console.
 +  - Add support for flow control in USB slave devices.
 +  - Add support for switching between gserial and cdc_acm using environment.
 +  - Minor changes to usbdcore_omap1510.c usbdcore_omap1510.h
 +  - Update usbcore slightly to ease host enumeration.
 +  - Fix non-portable endian problems in usbdcore and usbdcore_ep0.
 +  - Add AdderUSB_config as a defconfig to enable usage of the USB console
 +    by default with the Adder87x U-Boot port.
 +  Patch by Bryan O'Donoghue <bodonoghue@codehermit.ie>, 29 May 2006
 +
+ * Cleanup trab board for GCC-4.x
+ 
  * VoiceBlue update: use new MTD flash partitioning methods, use more
    reasonable TEXT_BASE, update default environment and enable keyed
    autoboot.