From 71add0b9f221acabb5c4fdc0a5bdb0667b0d03ff Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Mon, 29 Sep 2014 06:53:07 -0600
Subject: [PATCH] Update ChangeLog

---
 ChangeLog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 935df38a3d..f517f40d8d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8698,4 +8698,8 @@
 	  (2014-9-23).
 	* fs/semaphore: Create a build structure that will (eventually) support
 	  using the VFS to manage named semaphores (2014-9-23).
-
+	* configs/stm32f4discovery/include/board.h: STM32F4-Discovery: Fix some
+	  backward conditional compilation"(2104-9-29).
+	* nuttx/sched/init/os_start.c, semaphore/Make.defs, sem_initialize.c,
+	  and semaphore.h: Semaphore initialization is now only required if
+	  priority inheritance is enabled (2014-9-29).