diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:09:18 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:09:18 -0400 |
| commit | 68fe0f0a6dcd2ac1ace5da3647a6d1cf0f4d2fea (patch) | |
| tree | 69d855c2e46d42ef8f23680cf3a1e6ff38de9ef4 /kernel/power/process.c | |
| parent | 88fd449e734a4264347e12b8ff74ccb33a9b9a35 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes
Diffstat (limited to 'kernel/power/process.c')
| -rw-r--r-- | kernel/power/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c index 19db29f67558..87da817f9e13 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c | |||
| @@ -79,7 +79,7 @@ static int try_to_freeze_tasks(bool user_only) | |||
| 79 | 79 | ||
| 80 | /* | 80 | /* |
| 81 | * We need to retry, but first give the freezing tasks some | 81 | * We need to retry, but first give the freezing tasks some |
| 82 | * time to enter the regrigerator. | 82 | * time to enter the refrigerator. |
| 83 | */ | 83 | */ |
| 84 | msleep(10); | 84 | msleep(10); |
| 85 | } | 85 | } |
