Merge pull request #457 from soby-mathew/sm/fix_fpregs_restore

Fix issue in Floating point register restore
diff --git a/bl31/aarch64/context.S b/bl31/aarch64/context.S
index 70a1e5d..a72879b 100644
--- a/bl31/aarch64/context.S
+++ b/bl31/aarch64/context.S
@@ -291,7 +291,7 @@
 	ldr	x9, [x0, #CTX_FP_FPSR]
 	msr	fpsr, x9
 
-	str	x10, [x0, #CTX_FP_FPCR]
+	ldr	x10, [x0, #CTX_FP_FPCR]
 	msr	fpcr, x10
 
 	/*