From 84fc3f5d34ffcd634917dab861e444cec38f967c Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 24 Jun 2014 08:54:19 -0600
Subject: [PATCH] Update changelog

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

diff --git a/ChangeLog b/ChangeLog
index d15cccc330..6df492a502 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7490,3 +7490,6 @@
 	  pkt/pkt_send.c (2014-6-24).
 	* include/net/if.h and /net/arp/arp_inout.c:  Suppress ARP requests on
 	  data sent from packet sockets (2014-6-24).
+	* include/nuttx/net/netconfig.h: Move include/nuttx/net/uipopt.h to
+	  include/nuttx/net/netconfig.h (2014-6-24).
+