Merge with /home/tur/proj/usb_sticks/u-boot
diff --git a/CHANGELOG b/CHANGELOG
index df74705..e39b1e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,12 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Prevent USB commands from working when USB is stopped.
+
+* Add rudimentary handling of alternate settings of USB interfaces.
+  This is in order to fix issues with some USB sticks timing out
+  during initialization. Some code readability improvements.
+
 * PPC440 DDR setup: Set SDRAM0_CFG0[PMU]=0 for best performance
   AMCC suggested to set the PMU bit to 0 for best performace on
   the PPC440 DDR controller.