]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-sleep' and 'pm-runtime'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 10 Feb 2015 15:09:52 +0000 (16:09 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 10 Feb 2015 15:09:52 +0000 (16:09 +0100)
commit144e6bc283438c3a13c129eff05c320e33df8cc0
treeaa7a3ca6a0e78621ec7e1c059bba0218a68ec836
parent7d507a4a7648a1943459d97fa57148d0d7825244
parentb4d4c471897acc30e040e0b90d1d20e7dd8cc060
parentb23f50ff02e05d722e780fd44edffd19e7b687a9
Merge branches 'pm-sleep' and 'pm-runtime'

* pm-sleep:
  PM / hibernate: exclude freed pages from allocated pages printout
  PM / sleep: export suspend_resume trace event
  PM / sleep: Mention async suspend in PM_TRACE documentation
  PM / hibernate: Remove unused function

* pm-runtime:
  ACPI / PM: Remove unneeded nested #ifdef
  USB / PM: Remove unneeded #ifdef and associated dead code