diff --git a/ChangeLog b/ChangeLog
index 26df765f87..7f93650473 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10816,7 +10816,7 @@
 
 7.12 2015-xx-xx Gregory Nutt <gnutt@nuttx.org>
 
-	* fs/vfs/fs_poll.c:  Use sem_tickwait() insteadk of sem_timedwait()
+	* fs/vfs/fs_poll.c:  Use sem_tickwait() instead of sem_timedwait()
 	  From Macs Neklyudov (2015-08-13).
 	* fs/vfs/fs_poll.c:  If we fail to setup the poll for any file
 	  descriptor, for any reason, set the POLLERR bit (2015-08-13).
@@ -10839,4 +10839,6 @@
 	* include/nuttx/can.h and all CAN drivers: Add an error indication
 	  bit to the CAN message report.  This indication must then be cleared
 	  in all existing drivers.  More to come (2015-08-18).
-
+	* arch/arm/src/lpc17/lpc17_irq.c: Set NVIC vector address so that
+	  code can execute with a bootloader or can execute from RAM.  From
+	  Pavel Pisa (2015-08-20).
diff --git a/arch b/arch
index e81d1ea960..29f7043bc6 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit e81d1ea960b2da0d93dfb672bfd4d217fe688f52
+Subproject commit 29f7043bc649460e709f191fca47a0a026a50adb
diff --git a/configs b/configs
index bdd28db165..e3f37812a9 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit bdd28db16569fb05df637bf61a7b0e30aeffa6cc
+Subproject commit e3f37812a9a7595a7ddab1a625ebe857d104beb2