git.ipfire.org Git - people/ms/linux.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 4 Jun 2012 03:15:57 +0000 (20:15 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 4 Jun 2012 03:15:57 +0000 (20:15 -0700)

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

		1	2
drivers/acpi/sleep.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge