diff --git a/ChangeLog b/ChangeLog
index b381dcd3fe..3614e40162 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11089,4 +11089,8 @@
 	  Max Neklyudov (2015-11-12).
 	* arch/arm/src/samv7 and arch/arm/include/samv7:  Add support for the
 	  SAME70 family of chips (2015-11-14).
+	* configs/stm32f429i-disco: configs/stm32f429i-disco/src/stm32_nsh.c
+	  file calculated partition boundries based on page block sizes but
+	  mtd_partition() is expecting calculations based on erase block size.
+	  From Alan Carvalho de Assis (2015-11-16).
 
diff --git a/arch b/arch
index 2ed5f475b1..cce873c460 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 2ed5f475b11e34cd926c9591892d149d622e872f
+Subproject commit cce873c46060fe663f571cb922e642e097249c60
diff --git a/configs b/configs
index 95afbd39b4..744d52f25f 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 95afbd39b42d2689c894fdfc4e8b6123446772a9
+Subproject commit 744d52f25f764e1f31906d0e6491e9171840f262