From c44f9ec764a85c8a21f87ecd9d8a18b91ca2f881 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 9 Aug 2014 17:16:20 -0600
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 326375d87e4..26feeb00728 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8091,3 +8091,6 @@
 	* arch/arm/src/sama5/sam_freerun.c, .h, Kconfig, and Make.defs: Add
 	  support for a free-running timer wrapper around the low-level
 	  timer/counter logic (2014-8-9).
+	* arch/arm/Kconfig, src/sama5/sam_tickless.c, Kconfig, Make.defs: Use
+	  the one-shot and free-running timers to implement tickless OS support
+	  for SAMA5 (2014-8-9).