From 93d66a853180dcfc53919a088b73e980e97f6997 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 5 Jun 2015 13:20:14 -0600
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 247bdd83e7..5af68fbcbd 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10546,4 +10546,6 @@
 	  the Lincoln60 board (2015-06-03).
 	* drivers/net/tun.c: Misc. improvements to the TUN driver, mostly related
 	  to poll().  From Max Neklyudov (2015-06-04).
-
+	* fs/, fs/unionfs, include/nuttx, include/sys, Documentation: Add
+	  support for a union file system that can be used to overlay and merge
+	  the content of two mounted file systems (2015-06-05).