diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-26 22:46:19 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-26 22:46:48 -0500 |
| commit | 47b649590dbbea182f854d6470ee1cd59b7b7684 (patch) | |
| tree | a2de3610f9c5e963234cffb35b9d559aab62e164 /Documentation/cgroups/freezer-subsystem.txt | |
| parent | 3af5154a869bc278a829bb03e65a709480e821b0 (diff) | |
| parent | caca6a03d365883564885f2c1da3e88dcf65d139 (diff) | |
Merge 3.2-rc3 into usb-linus
This pulls in the latest USB bugfixes and helps a few of the drivers
merge nicer in the future due to changes in both branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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: | |||
| 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. |