diff --git a/[refs] b/[refs] index 4ed69a1a275f..61dd05ca20ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8131fc0e1c37563c278743e6def971be993cdda +refs/heads/master: 3ddd31fa34485ccbe358432a632bec148be18127 diff --git a/trunk/drivers/staging/zcache/tmem.c b/trunk/drivers/staging/zcache/tmem.c index eaa90213457b..56c8e606ad1c 100644 --- a/trunk/drivers/staging/zcache/tmem.c +++ b/trunk/drivers/staging/zcache/tmem.c @@ -3,7 +3,7 @@ * * Copyright (c) 2009-2011, Dan Magenheimer, Oracle Corp. * - * The primary purpose of Transcedent Memory ("tmem") is to map object-oriented + * The primary purpose of Transcendent Memory ("tmem") is to map object-oriented * "handles" (triples containing a pool id, and object id, and an index), to * pages in a page-accessible memory (PAM). Tmem references the PAM pages via * an abstract "pampd" (PAM page-descriptor), which can be operated on by a