diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-21 13:50:33 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-21 13:50:33 -0500 |
| commit | efd0bf97deeddd9ba53daabfc470a1399c6b0b2d (patch) | |
| tree | eec56da5fbc796bac7c67f1990a18f5e0a304059 /Documentation/cgroups | |
| parent | f8a15af093b19b86d56933c8757cee298d0f32a8 (diff) | |
| parent | 6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.
The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.
Conflicts:
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/wireless/libertas/cfg.c
Diffstat (limited to 'Documentation/cgroups')
| -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: | |||
| 33 | 33 | ||
| 34 | From a second, unrelated bash shell: | 34 | From a second, unrelated bash shell: |
| 35 | $ kill -SIGSTOP 16690 | 35 | $ kill -SIGSTOP 16690 |
| 36 | $ kill -SIGCONT 16990 | 36 | $ kill -SIGCONT 16690 |
| 37 | 37 | ||
| 38 | <at this point 16990 exits and causes 16644 to exit too> | 38 | <at this point 16690 exits and causes 16644 to exit too> |
| 39 | 39 | ||
| 40 | This happens because bash can observe both signals and choose how it | 40 | This happens because bash can observe both signals and choose how it |
| 41 | responds to them. | 41 | responds to them. |