diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index 5ec169c642946ffea213b0f5936440c673fe398a..57f480f95df1b06d5ef7c07df549cc01e9a81fba 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/clang/include/clang/Sema/Sema.h
@@ -1704,7 +1704,7 @@ public:
   ParsingDeclStackState PushParsingDeclaration();
   void PopParsingDeclaration(ParsingDeclStackState S, Decl *D);
   void EmitDeprecationWarning(NamedDecl *D, llvm::StringRef Message,
-                              SourceLocation Loc, bool UnkownObjCClass=false);
+                              SourceLocation Loc, bool UnknownObjCClass=false);
 
   void HandleDelayedDeprecationCheck(sema::DelayedDiagnostic &DD, Decl *Ctx);
 
@@ -1712,7 +1712,7 @@ public:
   // Expression Parsing Callbacks: SemaExpr.cpp.
 
   bool DiagnoseUseOfDecl(NamedDecl *D, SourceLocation Loc, 
-                         bool UnkownObjCClass=false);
+                         bool UnknownObjCClass=false);
   bool DiagnosePropertyAccessorMismatch(ObjCPropertyDecl *PD,
                                         ObjCMethodDecl *Getter,
                                         SourceLocation Loc);
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 6977a33ac4aecd3b459562f8b64f19b7e9cd87c4..22b373dbe9e9b1e4e60e4899e3dad66ea08e6eed 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -2904,7 +2904,7 @@ void Sema::HandleDelayedDeprecationCheck(DelayedDiagnostic &DD,
 
 void Sema::EmitDeprecationWarning(NamedDecl *D, llvm::StringRef Message,
                                   SourceLocation Loc,
-                                  bool UnkownObjCClass) {
+                                  bool UnknownObjCClass) {
   // Delay if we're currently parsing a declaration.
   if (ParsingDeclDepth) {
     DelayedDiagnostics.push_back(DelayedDiagnostic::makeDeprecation(Loc, D, 
@@ -2919,7 +2919,7 @@ void Sema::EmitDeprecationWarning(NamedDecl *D, llvm::StringRef Message,
     Diag(Loc, diag::warn_deprecated_message) << D->getDeclName() 
                                              << Message;
   else {
-    if (!UnkownObjCClass)
+    if (!UnknownObjCClass)
       Diag(Loc, diag::warn_deprecated) << D->getDeclName();
     else
       Diag(Loc, diag::warn_deprecated_fwdclass_message) << D->getDeclName();
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 30d22dafc67b1ced86b9e5d6f1c5d9eb438abd63..e481e5ce211fb61597dd97367345ac39b6700f60 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -56,7 +56,7 @@ using namespace sema;
 /// referenced), false otherwise.
 ///
 bool Sema::DiagnoseUseOfDecl(NamedDecl *D, SourceLocation Loc,
-                             bool UnkownObjCClass) {
+                             bool UnknownObjCClass) {
   if (getLangOptions().CPlusPlus && isa<FunctionDecl>(D)) {
     // If there were any diagnostics suppressed by template argument deduction,
     // emit them now.
@@ -77,12 +77,12 @@ bool Sema::DiagnoseUseOfDecl(NamedDecl *D, SourceLocation Loc,
 
   // See if the decl is deprecated.
   if (const DeprecatedAttr *DA = D->getAttr<DeprecatedAttr>())
-    EmitDeprecationWarning(D, DA->getMessage(), Loc, UnkownObjCClass);
+    EmitDeprecationWarning(D, DA->getMessage(), Loc, UnknownObjCClass);
 
   // See if the decl is unavailable
   if (const UnavailableAttr *UA = D->getAttr<UnavailableAttr>()) {
     if (UA->getMessage().empty()) {
-      if (!UnkownObjCClass)
+      if (!UnknownObjCClass)
         Diag(Loc, diag::err_unavailable) << D->getDeclName();
       else
         Diag(Loc, diag::warn_unavailable_fwdclass_message)