tree 13b839d10dfc7e886515e2ef9e91fe7881700545
parent 68e3e92620c323703bc7db75c2ba15239ee85c39
parent dbe9a2edd17d843d80faf2b99f20a691c1853418
author Linus Torvalds <torvalds@linux-foundation.org> 1338779757 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1338779757 -0700

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

Pull some left-over PM patches from Rafael J. Wysocki.

* 'pm-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / PM: Make acpi_pm_device_sleep_state() follow the specification
  ACPI / PM: Make __acpi_bus_get_power() cover D3cold correctly
  ACPI / PM: Fix error messages in drivers/acpi/bus.c
  rtc-cmos / PM: report wakeup event on ACPI RTC alarm
  ACPI / PM: Generate wakeup events on fixed power button