]> 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)
commit2ce9f3db9dbdc552ed9c69ccef0c1c256ff3e3bb
treeaa7a3ca6a0e78621ec7e1c059bba0218a68ec836
parent1435b30905c7bc0ea82cf9b1aea55f54857036ba
parent02a64fc5d5155ce00285b2851321570bfc60d71f
parenta7eeee05277e106156ee46e410ef7ff9c3bfcbc2
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