summaryrefslogtreecommitdiffstats
path: root/Documentation/vm/slabinfo.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-14 06:29:49 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-14 06:29:49 +0200
commit11c2d8174ed3dc4f1971564732689b4a39129702 (patch)
treeac00daa548ea8ac24ae7a5c8062312e335ab9858 /Documentation/vm/slabinfo.c
parentpowerpc/eeh: PERR/SERR bit settings during EEH device recovery (diff)
parentLinux 2.6.26 (diff)
downloadlinux-11c2d8174ed3dc4f1971564732689b4a39129702.tar.xz
linux-11c2d8174ed3dc4f1971564732689b4a39129702.zip
Merge commit 'origin/HEAD' into test-merge
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
Diffstat (limited to 'Documentation/vm/slabinfo.c')
-rw-r--r--Documentation/vm/slabinfo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/vm/slabinfo.c b/Documentation/vm/slabinfo.c
index e4230ed16ee7..df3227605d59 100644
--- a/Documentation/vm/slabinfo.c
+++ b/Documentation/vm/slabinfo.c
@@ -1,7 +1,7 @@
/*
* Slabinfo: Tool to get reports about slabs
*
- * (C) 2007 sgi, Christoph Lameter <clameter@sgi.com>
+ * (C) 2007 sgi, Christoph Lameter
*
* Compile by:
*
@@ -99,7 +99,7 @@ void fatal(const char *x, ...)
void usage(void)
{
- printf("slabinfo 5/7/2007. (c) 2007 sgi. clameter@sgi.com\n\n"
+ printf("slabinfo 5/7/2007. (c) 2007 sgi.\n\n"
"slabinfo [-ahnpvtsz] [-d debugopts] [slab-regexp]\n"
"-a|--aliases Show aliases\n"
"-A|--activity Most active slabs first\n"