diff --git a/ChangeLog b/ChangeLog
index 77e4b2836af..ab9fc4f4536 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11399,3 +11399,13 @@
 	  (2016-01-27).
 	* SPI: Rename the Calypso up_spiinitialize() to calypso_spibus_intialize()
 	  (2016-01-27).
+	* SPI: Rename the ez80 up_spiinitialize() to ez80_spibus_intialize()
+	  (2016-01-27).
+	* SPI: Rename the STR71xx up_spiinitialize() to str71_spibus_intialize()
+	  (2016-01-27).
+	* SPI: Rename the i.MX1 up_spiinitialize() to imx_spibus_intialize()
+	  (2016-01-27).
+	* SPI: Rename the LPC2378 up_spiinitialize() to lpc23_spibus_intialize()
+	  (2016-01-27).
+	* SPI: Rename the M9S12 up_spiinitialize() to hcs12_spibus_intialize()
+	  (2016-01-27).
diff --git a/arch b/arch
index c67b774ba2b..a55bcb538ab 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit c67b774ba2b64ed3a73f3568d2de25ec4fc3fdfb
+Subproject commit a55bcb538ab7ea49c64c898f96d1b94cfb3e0aa8
diff --git a/configs b/configs
index b1fc7fe2805..b5e84e337c9 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit b1fc7fe2805af8d21edd02fcb6522aeb524a4edd
+Subproject commit b5e84e337c9dd2fdd722a6ea1411de3298d5bf50