From f703b66152b2dd19016697a3be29c6d082143fa3 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 26 May 2015 15:05:51 -0600
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index f18a2dc4ea4..327609efefa 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10437,3 +10437,6 @@
 	  can cause interrupts to be lost.  So, if when the status register
 	  is read, the logic must also handle the timer overflow event.
 	  Found and fixed by Max Neklyudov (2015-05-26).
+	* arch/arm/include/kinetis and arch/arm/src/kinetis: Basic support
+	  for the Kinetis K20 architecture.  Taken from PX4.  This is the
+	  work of Jakob Odersky (2015-05-26).