Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (63 commits)
  PM / Clocks: Remove redundant NULL checks before kfree()
  PM / Documentation: Update docs about suspend and CPU hotplug
  ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist.
  ARM: mach-shmobile: sh7372 A4R support (v4)
  ARM: mach-shmobile: sh7372 A3SP support (v4)
  PM / Sleep: Mark devices involved in wakeup signaling during suspend
  PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image
  PM / Hibernate: Do not initialize static and extern variables to 0
  PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too
  PM / Hibernate: Add resumedelay kernel param in addition to resumewait
  MAINTAINERS: Update linux-pm list address
  PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvs
  PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvs
  PM / Hibernate: Add resumewait param to support MMC-like devices as resume file
  PM / Hibernate: Fix typo in a kerneldoc comment
  PM / Hibernate: Freeze kernel threads after preallocating memory
  PM: Update the policy on default wakeup settings
  PM / VT: Cleanup #if defined uglyness and fix compile error
  PM / Suspend: Off by one in pm_suspend()
  PM / Hibernate: Include storage keys in hibernation image on s390
  ...

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Documentation/power/basic-pm-debugging.txt
Simple merge

diff --cc Documentation/usb/power-management.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc drivers/hid/usbhid/hid-core.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc drivers/tty/Kconfig
index f462fa5f937c50e658c90c76d846f55eee630bfd,a7188a0b68eba04a63ec4847cec79de03e827462..33175504bb39da91c97d8c8b587144b16ae9e33e
--- 1/drivers/tty/Kconfig
--- 2/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@@ -60,9 -60,13 +60,13 @@@ config VT_CONSOL
  
          If unsure, say Y.
  
+ config VT_CONSOLE_SLEEP
+       def_bool y
+       depends on VT_CONSOLE && PM_SLEEP
+ 
  config HW_CONSOLE
        bool
 -      depends on VT && !S390 && !UML
 +      depends on VT && !UML
        default y
  
  config VT_HW_CONSOLE_BINDING

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

diff --cc drivers/usb/class/cdc-wdm.c
Simple merge

diff --cc drivers/usb/core/driver.c
Simple merge

diff --cc drivers/usb/core/hcd.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/scan.c
Simple merge