A couple small inconsequential fixes

[jtouton]

Summary

One fix adds a missing newline to a file, addressing a warning I see when building Clang. The other fixes a typo in a warning message.

[doug.gregor]

Do any of the regression tests make use of this diagnostic? They might have to change their "expected-error" checks to look for the corrected wording.

include/clang/Basic/DiagnosticSemaKinds.td

def warn_cxx98_compat_template_arg_null : Warning<
   "use of null pointer as non-type template argument is incompatible with "
   "C++98">, InGroup<CXX98Compat>, DefaultIgnore;
 def err_template_arg_untyped_null_constant : Error<
   "null non-type template argument must be cast to template parameter type %0">;
 def err_template_arg_wrongtype_null_constant : Error<
  "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<
   "template argument / label address difference / what did you expect?">;
 def err_template_arg_not_convertible : Error<
   "non-type template argument of type %0 cannot be converted to a value "
   "of type %1">;
 def warn_template_arg_negative : Warning<

include/clang/Basic/OpenCLImageTypes.def

 IMAGE_READ_WRITE_TYPE(image2d_msaa_depth, OCLImage2dMSAADepth)
 IMAGE_READ_WRITE_TYPE(image2d_array_msaa_depth, OCLImage2dArrayMSAADepth)
 IMAGE_READ_WRITE_TYPE(image3d, OCLImage3d)
 
 #undef IMAGE_TYPE
 #undef GENERIC_IMAGE_TYPE
 #undef IMAGE_READ_TYPE
 #undef IMAGE_WRITE_TYPE
-#undef IMAGE_READ_WRITE_TYPE
+#undef IMAGE_READ_WRITE_TYPE