From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Jun 2012 03:15:57 +0000 (-0700)
Subject: Merge branch 'pm-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: v3.5-rc2~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d578573b8328ce5aa6500b955444b89afa3c72c;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'pm-acpi' of git://git./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
---

4d578573b8328ce5aa6500b955444b89afa3c72c