From c5f4a2c84de5b329df20d206396a133205d3ade5 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 23 May 2015 06:51:22 -0600
Subject: [PATCH] Update ChangeLog

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5a354e6def..b7bb5ca9be 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10416,3 +10416,6 @@
 	  de Assis (2015-05-22).
 	* configs/lpcxpresso-lpc1115:  Support for the LPCXpression LPC1115
 	  board.  Contribuited by Alan Carvalho de Assis (2015-05-22).
+	* arch/arm/src/sam34/Kconfig, sam_serial.c, and chip/sam_uart.h:  Add
+	  support for optical mode for the SAM4CM UART1.  From Max Neklyudov
+	  (2015-05-23).