Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Oct 2011 13:18:39 +0000 (15:18 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Oct 2011 13:18:39 +0000 (15:18 +0200)
commit7e0bb71e75020348bee523720a0c2f04cc72f540
tree1a22d65bbce34e8cc0f82c543c9486ffb58332f7
parentb9e2780d576a010d4aba1e69f247170bf3718d6b
parent0ab1e79b825a5cd8aeb3b34d89c9a89dea900056
Merge branch 'pm-for-linus' of git://git./linux/kernel/git/rafael/linux-pm

* '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
  ...
22 files changed:
Documentation/kernel-parameters.txt
Documentation/power/basic-pm-debugging.txt
Documentation/usb/power-management.txt
MAINTAINERS
arch/arm/mach-shmobile/board-mackerel.c
drivers/Kconfig
drivers/Makefile
drivers/bluetooth/btusb.c
drivers/hid/usbhid/hid-core.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/usb/usbnet.c
drivers/tty/Kconfig
drivers/usb/class/cdc-acm.c
drivers/usb/class/cdc-wdm.c
drivers/usb/core/driver.c
drivers/usb/core/hcd.c
drivers/usb/core/hub.c
include/linux/device.h
include/linux/netdevice.h
net/mac80211/main.c
net/mac80211/mlme.c
net/mac80211/scan.c