OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[uclinux-h8/linux.git]
/
Documentation
/
cgroup-v1
/
cgroups.txt
diff --git
a/Documentation/cgroup-v1/cgroups.txt
b/Documentation/cgroup-v1/cgroups.txt
index
c6256ae
..
947e6fe
100644
(file)
--- a/
Documentation/cgroup-v1/cgroups.txt
+++ b/
Documentation/cgroup-v1/cgroups.txt
@@
-8,7
+8,7
@@
Original copyright statements from cpusets.txt:
Portions Copyright (C) 2004 BULL SA.
Portions Copyright (c) 2004-2006 Silicon Graphics, Inc.
Modified by Paul Jackson <pj@sgi.com>
-Modified by Christoph Lameter <cl
ameter@sgi
.com>
+Modified by Christoph Lameter <cl
@linux
.com>
CONTENTS:
=========