diff options
author | Pekka Enberg <penberg@kernel.org> | 2012-01-11 20:11:29 +0100 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2012-01-11 20:11:29 +0100 |
commit | 5878cf431ca7233a56819ca6970153ac0b129599 (patch) | |
tree | e5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /Documentation/cgroups/freezer-subsystem.txt | |
parent | slub: disallow changing cpu_partial from userspace for debug caches (diff) | |
parent | slub: add missed accounting (diff) | |
download | linux-5878cf431ca7233a56819ca6970153ac0b129599.tar.xz linux-5878cf431ca7233a56819ca6970153ac0b129599.zip |
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'Documentation/cgroups/freezer-subsystem.txt')
-rw-r--r-- | Documentation/cgroups/freezer-subsystem.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/cgroups/freezer-subsystem.txt b/Documentation/cgroups/freezer-subsystem.txt index c21d77742a07..7e62de1e59ff 100644 --- a/Documentation/cgroups/freezer-subsystem.txt +++ b/Documentation/cgroups/freezer-subsystem.txt @@ -33,9 +33,9 @@ demonstrate this problem using nested bash shells: From a second, unrelated bash shell: $ kill -SIGSTOP 16690 - $ kill -SIGCONT 16990 + $ kill -SIGCONT 16690 - <at this point 16990 exits and causes 16644 to exit too> + <at this point 16690 exits and causes 16644 to exit too> This happens because bash can observe both signals and choose how it responds to them. |