diff --git a/ChangeLog b/ChangeLog
index 1c079d2433..77e4b2836a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11393,3 +11393,9 @@
 	  (2016-01-26).
 	* SPI: Rename the LPC43xx up_spiinitialize() to lpc43_spibus_intialize()
 	  (2016-01-26).
+	* SPI: Rename the AVR up_spiinitialize() to avr_spibus_intialize()
+	  (2016-01-27).
+	* SPI: Rename the LPC2148 up_spiinitialize() to lpc214x_spibus_intialize()
+	  (2016-01-27).
+	* SPI: Rename the Calypso up_spiinitialize() to calypso_spibus_intialize()
+	  (2016-01-27).
diff --git a/Documentation b/Documentation
index 8fab2a865d..413649314c 160000
--- a/Documentation
+++ b/Documentation
@@ -1 +1 @@
-Subproject commit 8fab2a865d3cc1496588c5a1227037dfb1f970e3
+Subproject commit 413649314c27feb6b72dcfee8504bfbb50547e73
diff --git a/arch b/arch
index cdbbd6417c..c67b774ba2 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit cdbbd6417c82e7e8ee72ecd9d0b5bd93b886d41c
+Subproject commit c67b774ba2b64ed3a73f3568d2de25ec4fc3fdfb
diff --git a/configs b/configs
index 168b4f43e1..b1fc7fe280 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 168b4f43e1986526bd3926f00d812f5d7dda414d
+Subproject commit b1fc7fe2805af8d21edd02fcb6522aeb524a4edd
diff --git a/tools/cnvwindeps.c b/tools/cnvwindeps.c
index b26b3c9b67..7f71bda584 100644
--- a/tools/cnvwindeps.c
+++ b/tools/cnvwindeps.c
@@ -215,9 +215,9 @@ int main(int argc, char **argv, char **envp)
               path = skip_spaces(next);
               if (*path == '#')
                 {
-                  /* Comment line */
+                  /* The reset of the line is comment */
 
-                  puts(g_line);
+                  puts(path);
                   break;
                 }
 
@@ -302,4 +302,3 @@ int main(int argc, char **argv, char **envp)
 }
 
 #endif /* HOST_CYGWIN */
-