From 2de5be34e52689ba7015a6839de694f007092045 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 21 Jan 2016 19:29:43 -0600 Subject: [PATCH] Update ChangeLog --- ChangeLog | 5 ++++- arch | 2 +- sched/clock/clock_systimespec.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dce32ae0dcb..b2432bfce2f 100755 --- a/ChangeLog +++ b/ChangeLog @@ -11340,4 +11340,7 @@ conversion (2016-01-21). * include/nuttx/clock.h: Get rid of clock_systimer32() and clock_systime64(). There is now only clock_systimer() (2016-01-21). - + * arch/arm/src/kinetis: Numerous updates to the Kinetis ENET driver. + From Andrew Webster (2016-01-21). + * arch/arm/src/kinetis: Add support for the MK60N512VLL100 Kinetis part. + From Andrew Webster (2016-01-21). diff --git a/arch b/arch index 8dd7a88dd57..eabf13f41e3 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit 8dd7a88dd571af62e1da85ef4f9717db6cd80028 +Subproject commit eabf13f41e38c104b907bb4cb29655b3cba9f35f diff --git a/sched/clock/clock_systimespec.c b/sched/clock/clock_systimespec.c index 260be4aab6f..5d6009d0510 100644 --- a/sched/clock/clock_systimespec.c +++ b/sched/clock/clock_systimespec.c @@ -138,7 +138,7 @@ int clock_systimespec(FAR struct timespec *ts) uint64_t secs; uint64_t nsecs; - /* Get the time since power-on in seconds and microsecond. + /* Get the time since power-on in seconds and microseconds. * NOTE that overflow is still possible if we use a 64-bit * timer. */