From e23002fcfc7b0dcdf9e5bfa302fb1e69b42a253d Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 10 Mar 2015 12:17:54 -0600
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 9c6181b99c..6da95886ab 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9945,4 +9945,5 @@
 	* sched/mqueue/mq_timedsend.c:  Should not check for valid time if
 	  there is space in the message queue.  Noted by Freddie Chopin
 	  (2015-03-10).
-
+	* arch/arm/src/tiva/tiva_timerlib.c:  Fix a typo in peripheral wait
+	  logic:  gptm, not gpio.  From Bradley Noyes (2015-03-10).