diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 18:24:35 -0400 |
| commit | 811158b147a503fbdf9773224004ffd32002d1fe (patch) | |
| tree | 0a11dcfefe721bfc38ea9f1f4a238822dbae0dda /kernel/power | |
| parent | 4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd (diff) | |
| parent | b26e0ed4936b743b693a4cc1413561fa3e4eaf65 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
trivial: Update my email address
trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
trivial: Fix misspelling of "Celsius".
trivial: remove unused variable 'path' in alloc_file()
trivial: fix a pdlfush -> pdflush typo in comment
trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
trivial: wusb: Storage class should be before const qualifier
trivial: drivers/char/bsr.c: Storage class should be before const qualifier
trivial: h8300: Storage class should be before const qualifier
trivial: fix where cgroup documentation is not correctly referred to
trivial: Give the right path in Documentation example
trivial: MTD: remove EOL from MODULE_DESCRIPTION
trivial: Fix typo in bio_split()'s documentation
trivial: PWM: fix of #endif comment
trivial: fix typos/grammar errors in Kconfig texts
trivial: Fix misspelling of firmware
trivial: cgroups: documentation typo and spelling corrections
trivial: Update contact info for Jochen Hein
trivial: fix typo "resgister" -> "register"
...
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/disk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index f3db382c2b2d..5f21ab2bbcdf 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c | |||
| @@ -289,7 +289,7 @@ static int create_image(int platform_mode) | |||
| 289 | * hibernation_snapshot - quiesce devices and create the hibernation | 289 | * hibernation_snapshot - quiesce devices and create the hibernation |
| 290 | * snapshot image. | 290 | * snapshot image. |
| 291 | * @platform_mode - if set, use the platform driver, if available, to | 291 | * @platform_mode - if set, use the platform driver, if available, to |
| 292 | * prepare the platform frimware for the power transition. | 292 | * prepare the platform firmware for the power transition. |
| 293 | * | 293 | * |
| 294 | * Must be called with pm_mutex held | 294 | * Must be called with pm_mutex held |
| 295 | */ | 295 | */ |
| @@ -412,7 +412,7 @@ static int resume_target_kernel(bool platform_mode) | |||
| 412 | * hibernation_restore - quiesce devices and restore the hibernation | 412 | * hibernation_restore - quiesce devices and restore the hibernation |
| 413 | * snapshot image. If successful, control returns in hibernation_snaphot() | 413 | * snapshot image. If successful, control returns in hibernation_snaphot() |
| 414 | * @platform_mode - if set, use the platform driver, if available, to | 414 | * @platform_mode - if set, use the platform driver, if available, to |
| 415 | * prepare the platform frimware for the transition. | 415 | * prepare the platform firmware for the transition. |
| 416 | * | 416 | * |
| 417 | * Must be called with pm_mutex held | 417 | * Must be called with pm_mutex held |
| 418 | */ | 418 | */ |