From 2b30f35890665dbc3719a60e68499e5fbaeb8e2e Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 13 May 2015 07:29:48 -0600
Subject: [PATCH] Update changeLog

---
 ChangeLog | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 43b76a1417..5178ca17b6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10370,4 +10370,9 @@
 	* maXTouch Xplained Pro:  The above TWIHS fix was the last barrier to
 	  getting the touchscreen workingoin the maXTouch Xplained Pro LCD
 	  (2015-05-12).
-
+	* net/route/ and net/netdev/netdev_ioctl.c: Complete implementation of
+	  the IPv6 routing logic.  From Max Neklyudov (2015-05-13).
+	* net/udp/: Add inclusion of assert.h in networking files where needed
+	  to avoid compilation errors.  From Max Neklyudov (2015-05-13).
+	* /net/route/netdev_router.c: Fix bug in IPv6 router from Max Neklyudov
+	  (2015-05-13).