From 810f579330ade864847eb199c8a9047e20001159 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 28 Jun 2014 08:41:24 -0600
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 693c3fd2249..27e1b6b7067 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7555,4 +7555,6 @@
 	  (2014-6-17).
 	* net/utils:  Move net/uip/uip_chksum.c to net/utils/net_chksum.c
 	  (2014-6-17).
+	* configs/sama5d4-ek/at25boot and src/at25_main.c:  Add a configuration
+	  that will load a bootloader into AT25 Serial FLASH (2014-6-28).