Index: include/clang/Basic/DiagnosticSemaKinds.td
===================================================================
--- include/clang/Basic/DiagnosticSemaKinds.td
+++ include/clang/Basic/DiagnosticSemaKinds.td
@@ -3750,8 +3750,8 @@
  "null non-type template argument of type %0 does not match template parameter "
  "of type %1">;
 def err_deduced_non_type_template_arg_type_mismatch : Error<
-  "deduced non-type template argument does not have the same type as the "
-  "its corresponding template parameter%diff{ ($ vs $)|}0,1">;
+  "deduced non-type template argument does not have the same type as its "
+  "corresponding template parameter%diff{ ($ vs $)|}0,1">;
 def err_non_type_template_arg_subobject : Error<
   "non-type template argument refers to subobject '%0'">;
 def err_non_type_template_arg_addr_label_diff : Error<
Index: include/clang/Basic/OpenCLImageTypes.def
===================================================================
--- include/clang/Basic/OpenCLImageTypes.def
+++ include/clang/Basic/OpenCLImageTypes.def
@@ -79,4 +79,4 @@
 #undef GENERIC_IMAGE_TYPE
 #undef IMAGE_READ_TYPE
 #undef IMAGE_WRITE_TYPE
-#undef IMAGE_READ_WRITE_TYPE
\ No newline at end of file
+#undef IMAGE_READ_WRITE_TYPE