diff --git a/ChangeLog b/ChangeLog
index 7a91f015bc3..b43487d5ab2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11202,3 +11202,6 @@
 	* fs/semaphore: Named semaphores:  Back out "fix" of 2015-10-22.  It was
 	  correct before.  The change of 2015-10-22 probably broke named
 	  semaphores (2015-12-02).
+	* arch/arm/src/samv7: Bring programmable clock logic from SAMA5 into
+	  SAMV7 (2015-12-03).
+
diff --git a/arch b/arch
index 3e4fa2c1aa3..36be121ac43 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 3e4fa2c1aa35bce85321352033b62241db7ae398
+Subproject commit 36be121ac4338b771633610d95cb75e5ddc3f3fd
diff --git a/configs b/configs
index 0e8e6abcaa5..cbfce044c83 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 0e8e6abcaa593103af40aaa33e1fc5e56cbfd91d
+Subproject commit cbfce044c83ea4a720467276ca03bc84efc5fe55