- Merge suspend_save_image() from both into one.
- Rename to swsusp_write(). 
- Remove pmdisk_write().
- Fixup call in kernel/power/disk.c and software_suspend().
- Mark lock_swapdevices() static again.