From 634762cfda77801f6aad8b286f2de64073d5ef0f Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 11 Mar 2015 07:56:37 -0600
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 6da95886ab..5a3f1643c7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9947,3 +9947,5 @@
 	  (2015-03-10).
 	* arch/arm/src/tiva/tiva_timerlib.c:  Fix a typo in peripheral wait
 	  logic:  gptm, not gpio.  From Bradley Noyes (2015-03-10).
+	* drivers/net/tun.c, Make.defs, include/nuttx/net/net.h, tun.h, and
+	  net/Kconfig: Add TUN device.  From Max Neklyudov (2015-03-11).