From 5ec3693bb7a07e6f08970a2c01876ba60a7520e7 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 5 Feb 2015 13:55:36 -0600
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 292a0b0bd2..f7b1e34a00 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9669,3 +9669,6 @@
 	* net/icmpv6/icmpv6_input.c and icmpv6_rnotify.c:  With these two
 	  changes both ICMPv6 autonomous autoconfiguration and router
 	  functionality appear to be working with no problems (2015-02-05).
+	* arch/arm/src/tiva and configs/tm4c123g-launchpad:  Adds support for
+	  TM4C123G timers; integrates with the TM4C123G Launchpad.  From Calvin
+	  Maguranis (2015-02-05).