Merge with /home/hs/U-Boot/u-boot-dev
diff --git a/CHANGELOG b/CHANGELOG
index 8c3f13e..1604376 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,16 @@
Changes since U-Boot 1.1.4:
======================================================================
+* VoiceBlue update: use new MTD flash partitioning methods, use more
+ reasonable TEXT_BASE, update default environment and enable keyed
+ autoboot.
+ Patch by Ladislav Michl, 16. Aug 2005
+
+* Add forgotten changes for the PLEB 2 Board.
+ Patch by David Snowdon, 13. Aug 2005
+
* Add support for wrPPMC7xx/74xx boards
- Patch from Richard Danter, 12 Aug 2005
+ Patch by Richard Danter, 12 Aug 2005
* Add support for gth2 board
Patch by Thomas Lange, Aug 11 2005