projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 68e3e92 dbe9a2e)
Merge branch 'pm-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jun 2012 03:15:57 +0000 (20:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jun 2012 03:15:57 +0000 (20:15 -0700)
commit4d578573b8328ce5aa6500b955444b89afa3c72c
tree13b839d10dfc7e886515e2ef9e91fe7881700545tree | snapshot
parent68e3e92620c323703bc7db75c2ba15239ee85c39commit | diff
parentdbe9a2edd17d843d80faf2b99f20a691c1853418commit | diff
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
drivers/acpi/sleep.c diff1 | diff2 | blob | history
John Crispins staging tree