Merge commit 'v2.6.30-rc1' into core/urgent

Merge reason: need latest upstream to queue up dependent fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>

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)
  *      hibernation_snapshot - quiesce devices and create the hibernation
  *      snapshot image.
  *      @platform_mode - if set, use the platform driver, if available, to
- *                       prepare the platform frimware for the power transition.
+ *                       prepare the platform firmware for the power transition.
  *
  *      Must be called with pm_mutex held
  */
@@ -412,7 +412,7 @@ static int resume_target_kernel(bool platform_mode)
  *      hibernation_restore - quiesce devices and restore the hibernation
  *      snapshot image.  If successful, control returns in hibernation_snaphot()
  *      @platform_mode - if set, use the platform driver, if available, to
- *                       prepare the platform frimware for the transition.
+ *                       prepare the platform firmware for the transition.
  *
  *      Must be called with pm_mutex held
  */