diff --git a/ChangeLog b/ChangeLog
index fee250aa173..0d7e6fceb9f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9030,4 +9030,6 @@
 	  and GMAC on the SAMA5D3 working together (2014-11-20).
 	* libnx/nxtk/nxtk_drawframe.c: Remove warnings when CONFIG_NXTK_BORDERWIDTH
 	  is set to zero.  From Pierre-Noel Bouteville (2014-11-20).
+	* fs/vfs/fs_poll.c: Add proper handling for sem_timedwait errnos.
+	  From Jussi Kivilinna (2014-11-21).