diff --git a/ChangeLog b/ChangeLog
index c2b8ab6618..37353e71e7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9877,3 +9877,8 @@
 	  the open count will only be incremented from 0 to 1. This causes
 	  problems when trying to open the can bus from two different tasks.
 	  SourceForge Patch #46 from Anonymous (2015-02-23).
+	* Tiva TM4c1294: Updates from Frank Sautter (2015-02-24).
+	* fs/aio: Corrrect some backward tests in aio_read() and aio_write():
+	  Socket descriptors have higher numbers than file descriptors.  In
+	  aio_contain(),  Copy u.ptr (void *) when initializing aioc and not
+	  the case specific u.aioc_filep.  From Michal Ulianko (2015-02-24).
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index d0e699e8d6..8ec9de6526 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -3580,7 +3580,7 @@ nsh>
   <td>
     <p>
       <a name="titm4c129x"><b>TI Tiva TM4C129X</b>.</a>
-      This port uses the TI Tiva C Series TM4C129x Connected Development Kit <a href="http://www.ti.com/tool/dk-tm4c129x">(DK-TM4C129X)</a>.
+      This port uses the TI Tiva C Series TM4C129X Connected Development Kit <a href="http://www.ti.com/tool/dk-tm4c129x">(DK-TM4C129X)</a>.
     </p>
     <ul>
       <p>