diff options
author | Christoph Lameter <cl@linux.com> | 2016-03-17 17:21:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-17 18:09:34 -0400 |
commit | 93e205a728e6cb8d7d11f6836e289798a1de25e2 (patch) | |
tree | a1282bcf33d5c98c00941b7bc06781d11525ce97 /Documentation/cgroup-v1 | |
parent | dfbf2897d00499f94cd53a9806e697392cbfe6a3 (diff) |
fix Christoph's email addresses
There are various email addresses for me throughout the kernel. Use the
one that will always be valid.
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/cgroup-v1')
-rw-r--r-- | Documentation/cgroup-v1/cgroups.txt | 2 | ||||
-rw-r--r-- | Documentation/cgroup-v1/cpusets.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/cgroup-v1/cgroups.txt b/Documentation/cgroup-v1/cgroups.txt index c6256ae9885b..947e6fe31ef9 100644 --- a/Documentation/cgroup-v1/cgroups.txt +++ b/Documentation/cgroup-v1/cgroups.txt | |||
@@ -8,7 +8,7 @@ Original copyright statements from cpusets.txt: | |||
8 | Portions Copyright (C) 2004 BULL SA. | 8 | Portions Copyright (C) 2004 BULL SA. |
9 | Portions Copyright (c) 2004-2006 Silicon Graphics, Inc. | 9 | Portions Copyright (c) 2004-2006 Silicon Graphics, Inc. |
10 | Modified by Paul Jackson <pj@sgi.com> | 10 | Modified by Paul Jackson <pj@sgi.com> |
11 | Modified by Christoph Lameter <clameter@sgi.com> | 11 | Modified by Christoph Lameter <cl@linux.com> |
12 | 12 | ||
13 | CONTENTS: | 13 | CONTENTS: |
14 | ========= | 14 | ========= |
diff --git a/Documentation/cgroup-v1/cpusets.txt b/Documentation/cgroup-v1/cpusets.txt index fdf7dff3f607..e5cdcd445615 100644 --- a/Documentation/cgroup-v1/cpusets.txt +++ b/Documentation/cgroup-v1/cpusets.txt | |||
@@ -6,7 +6,7 @@ Written by Simon.Derr@bull.net | |||
6 | 6 | ||
7 | Portions Copyright (c) 2004-2006 Silicon Graphics, Inc. | 7 | Portions Copyright (c) 2004-2006 Silicon Graphics, Inc. |
8 | Modified by Paul Jackson <pj@sgi.com> | 8 | Modified by Paul Jackson <pj@sgi.com> |
9 | Modified by Christoph Lameter <clameter@sgi.com> | 9 | Modified by Christoph Lameter <cl@linux.com> |
10 | Modified by Paul Menage <menage@google.com> | 10 | Modified by Paul Menage <menage@google.com> |
11 | Modified by Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 11 | Modified by Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> |
12 | 12 | ||