From e8636432390f6558d8836fbeb990846405e9d8f3 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 28 Jul 2016 09:42:11 -0600
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 42bd15490d..c3a613069b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12402,3 +12402,8 @@
 	  were wrong.  FIONWRITE should return the number of bytes waiting in
 	  the outgoing send queue, not the free space.  Rather, FIONSPACE should
 	  return the free space in the send queue (2016-07-25).
+	* sched/clock and sched/sched: Add standard adjtime() interface and
+	  basic timekeeping support.  From Max Neklyudov (Merged on
+	  20160-07-28).
+	* arch/arm/src/stm32:  Add timekeeping support for the STM32 tickless
+	  mode.  From Max Neklyudov (Merged on 20160-07-28).