Merge remote-tracking branch 'public/pr/2226' into development-psa-proposed

simonbutcher · simonbutcher · commit 5f62a5731c22 · 2018-11-23T22:11:37.000Z
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "crypto"]
 	path = crypto
 	url = git@github.com:ARMmbed/mbedtls-psa.git
-	branch = feature-psa-tls-integration-proposed
+	branch = feature-psa
diff --git a/crypto b/crypto
@@ -1 +1 @@
-Subproject commit 9edcc3e8fba31bff4c31b685448f3b47edce6d92
+Subproject commit 0e9ff8546bb496ea971b780f4f3b45874373614b
