From 0d18b13a16d6f8f207eeb9cb9a69eadea7cd4abb Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 18 Nov 2015 07:09:59 -0600
Subject: [PATCH] Update ChangeLog

---
 ChangeLog | 2 ++
 arch      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 26f03abe0b2..c626c831758 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11109,3 +11109,5 @@
 	  Ken Petit (2015-11-18).
 	* drivers/mtd/smart.c: Fix a Smart wear-leveling bug. From Ken Petit
 	  (2015-11-18).
+	* arch/sim/src/up_spiflash.c:  Add support for W25 FLASH simulation.
+	  From Ken Petit (2015-11-18).
diff --git a/arch b/arch
index 94c884e5587..c0b78aab85f 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 94c884e5587e058cf65d7db352ea44203330db5a
+Subproject commit c0b78aab85f0a31a85c90d01c60d4749a193af73