From 95dd304d117504f465a627074e731f1fa0489e84 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 26 Aug 2014 15:38:11 -0600
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 79f76b3e5d1..6db5761866e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8258,3 +8258,7 @@
 	  include/nuttx/addrenv.h, arch.h, pgalloc.h, mm/Kconfig, mm_pgalloc.c,
 	  sched/init/os_start.c: Cortex-A/SAMA5 address environment support is
 	  code complete (untested) (2014-8-25).
+	* arch/arm/include/tiva and src/tive:  Add support for the TI CC3200.
+	  From Jim Ewing (2014-8-26).
+	* configs/cc3200-launchpad:  Add support for the TI CC3200 Launchpad.
+	  From Jim Ewing (2014-8-26).