From 07ff23d1cea5923cb1bb571199a7aeddecb747df Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Mon, 20 Oct 2014 15:46:55 -0600
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index d66488e912a..7deb153e684 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8856,3 +8856,7 @@
 	  Kit (2014-10-20).
 	* configs/olimex-efm32g880f128-stk: Add board support for the Olimex
 	  EFM32G8809128 STK (2014-10-20).
+	* drivers/lcd/Kconfig, ili9341.c, Make.defs, and include/nuttx/lcd/ili9341.h:
+	  Add support for a generic ILI9341 driver.  From Marco Krahl (2014-10-20).
+	* configs/stm32f429i-disco/Kconfig, src/ and lcd/:  Add support for the
+	  STM32F429i Discovery's LCD.  From Marco Krahl (2014-10-20).