Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

diff --combined kernel/power/disk.c
index f2b3b0e,e03d85e..0b43847
--- 1/kernel/power/disk.c
--- 2/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@@ -53,7 -53,7 +53,7 @@@ static void power_down(suspend_disk_met
  
        switch(mode) {
        case PM_DISK_PLATFORM:
-               kernel_power_off_prepare();
+               kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
                error = pm_ops->enter(PM_SUSPEND_DISK);
                break;
        case PM_DISK_SHUTDOWN:
@@@ -95,13 -95,6 +95,6 @@@ static int prepare_processes(void
                goto thaw;
        }
  
-       if (pm_disk_mode == PM_DISK_PLATFORM) {
-               if (pm_ops && pm_ops->prepare) {
-                       if ((error = pm_ops->prepare(PM_SUSPEND_DISK)))
-                               goto thaw;
-               }
-       }
- 
        /* Free memory before shutting down devices. */
        if (!(error = swsusp_shrink_memory()))
                return 0;
@@@ -367,14 -360,14 +360,14 @@@ power_attr(resume)
  
  static ssize_t image_size_show(struct subsystem * subsys, char *buf)
  {
 -      return sprintf(buf, "%u\n", image_size);
 +      return sprintf(buf, "%lu\n", image_size);
  }
  
  static ssize_t image_size_store(struct subsystem * subsys, const char * buf, size_t n)
  {
 -      unsigned int size;
 +      unsigned long size;
  
 -      if (sscanf(buf, "%u", &size) == 1) {
 +      if (sscanf(buf, "%lu", &size) == 1) {
                image_size = size;
                return n;
        }