From df1f9fad03fbfd2f179c0138ba8036c27c4a6e38 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 27 Dec 2014 07:45:36 -0600
Subject: [PATCH] Updte ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 742e1cbbc7..b1cd87651d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9332,3 +9332,9 @@
 	* arch/arm/src/efm32/efm32_pwm.c/.h, efm32_timer.c/.h, and related
 	  build files: Add support for timer/PWM on the EFM32GG.  From
 	  Pierre-noel Bouteville (2014-12-26).
+	* drivers/serial/Kconfig, serial.c, serialirq.c, and
+	  include/nuttx/serial/serial.h:  Add watermark levels to the serial
+	  RX flow control logic.  Modify the rxflowcontrol method to accept
+	  the number of bytes in the buffer and a boolean indication of which
+	  watermark was crossed (2014-12-27).
+