From b30087ed44cdcc92d37fd7117828a07d8aa4440e Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 15 Aug 2014 04:00:51 -0600
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index fda8856526..ff151357a2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8114,3 +8114,11 @@
 	  (2014-8-12)
 
 7.5 2014-xx-xx Gregory Nutt <gnutt@nuttx.org>
+
+	* clock/clock_systimespec.c and sched/clock/clock_gettime.c:  When
+	  reading the system timer, don't read a struct timespec, convert it
+	  to a fake tick count, then back to a timespec (2014-8-15).
+	* sched/clock/Make.defs, clock_gettime.c, clock_settime.c, include/time.h,
+	  nuttx/clock.h, configs/vsn/src/sif.c: Remove CLOCK_ACTIVETIME. It is non-
+	  standard, unused, and gets in the way of maintaining clocks (2014-8-15).
+