]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-assorted-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 15 Jun 2013 22:31:30 +0000 (00:31 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 15 Jun 2013 22:31:30 +0000 (00:31 +0200)
* pm-assorted-next:
  PM / wakeup: Adjust messaging for wake events during suspend
  PM / Runtime: Update .runtime_idle() callback documentation
  PM / Runtime: Rework the "runtime idle" helper routine
  PM / Hibernate: print physical addresses consistently with other parts of kernel

1  2 
drivers/acpi/device_pm.c
drivers/ata/libata-core.c

Simple merge
Simple merge