summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-10 16:09:52 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-10 16:09:52 +0100
commitf52386892fb17b4a70a7a73240c0f04a0a6011a6 (patch)
treeaa7a3ca6a0e78621ec7e1c059bba0218a68ec836 /kernel
parentf7cc61f0667a26a2a02ba0a2b5f977070378e324 (diff)
parenta64fc82c4f1598db024de7b3d79e7213379769ff (diff)
parent8dcb52cbcadf7cbee62a7723f8a588a31281eccd (diff)
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