From 09a58263c85940b8cc420b5bae715399b44e875c Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 13 May 2016 12:19:26 -0600
Subject: [PATCH] Update ChangeLog

---
 ChangeLog | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 87f923ce2a..5be696ba87 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11718,6 +11718,14 @@
 	* Several Makefiles: Add .PHONY definitions to prevent 'clean up to date'
 	  message weirdness when 'make clean' is done with no .config or Make.defs
 	  file (2016-05-10).
+	* include/nuttx/can.h and drivers/can.c:  Improve CAN error reporting.
+	  From Frank Benkert (2016-05-11).
+	* fs/Kconfig:  Allow CONFIG_FS_WRITABLE to be manually selectable
+	  (2016-05-11).
+	* Various file:  Search for places where a stray semicolon following an
+	  if condition cause the if body to be executed unconditionally.  Fixes
+	  in all SAM DMA logic, unionfs, OS signalling logic,
 	* configs/nucleo-144: Basic port for the Nucleo-144 board with the
 	  STM32F746ZG MCU.  From Kconstantin Berezenko (2015-05-12).
-
+	* arch/arm-src/armv7-a:  Complete logic to initialize each CPUn, n > 0,
+	  when CONFIG_SMP=y (2016-05-13).