diff --git a/TODO b/TODO
index 91add5d048..290dc13ef4 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated March 23, 2016)
+NuttX TODO List (Last updated March 31, 2016)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This file summarizes known NuttX bugs, limitations, inconsistencies with
@@ -14,7 +14,7 @@ nuttx/
   (3)  Signals (sched/signal, arch/)
   (2)  pthreads (sched/pthread)
   (0)  Message Queues (sched/mqueue)
-  (7)  Kernel/Protected Build
+  (8)  Kernel/Protected Build
   (3)  C++ Support
   (6)  Binary loaders (binfmt/)
  (12)  Network (net/, drivers/net)
@@ -584,6 +584,13 @@ o Kernel/Protected Build
                improvement.  However, there is no strong motivation now do
                do that partitioning work.
 
+  Title:       TIMER INTERRUPT CALLBACK
+  Description: The timer upper half driver at drivers/timers/timer.c performs
+               interrupt level callbacks into applications.  This, of course,
+               will never work in anything but a non-secure, flat build.
+  Status:      Open
+  Priority:    Medium.  The driver is only usable with all of its features in a FLAT build.
+  
 o C++ Support
   ^^^^^^^^^^^
 
diff --git a/arch b/arch
index 0ed1a4c532..d4b38f65dd 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 0ed1a4c532869ad061ff696f3ba11b92fe635ed4
+Subproject commit d4b38f65ddc36f3086aee529b3418a3abbae3c96
diff --git a/configs b/configs
index 244c8e8220..79bf36885d 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 244c8e8220075e528617901216c55aee8240de23
+Subproject commit 79bf36885d105d6ec3179d6a4831a4e48dc38196