From 0d010fd981b9a03eb0bb8db080f8bee060bf1b60 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 27 Nov 2014 17:44:48 -0600
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index ee9b138d038..c0d394b2bd7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9074,4 +9074,7 @@
 	  https://github.com/PX4/NuttX/pull/28.diff (2014-11-27).
 	* drivers/loop.c:  Loop device should return -EINTR is interrupt by a
 	  signal (2014-11-27).
-
+	* drivers/input/djoystick.c and include/nuttx/input/djoystick.h.  Also
+	  drivers/input/Kconfig and Make.defs, and include/nuttx/fs/ioctl.h: Add
+	  an interface definition and upper half driver for a discrete joystick
+	  device (2014-11-27).