117 files changed, 248 insertions, 261 deletions

diff --git a/include/clang/ARCMigrate/ARCMT.h b/include/clang/ARCMigrate/ARCMT.h
index cce8661652..c167d3c319 100644
--- a/include/clang/ARCMigrate/ARCMT.h
+++ b/include/clang/ARCMi