diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-10 16:09:52 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-10 16:09:52 +0100 |
| commit | f52386892fb17b4a70a7a73240c0f04a0a6011a6 (patch) | |
| tree | aa7a3ca6a0e78621ec7e1c059bba0218a68ec836 /kernel | |
| parent | f7cc61f0667a26a2a02ba0a2b5f977070378e324 (diff) | |
| parent | a64fc82c4f1598db024de7b3d79e7213379769ff (diff) | |
| parent | 8dcb52cbcadf7cbee62a7723f8a588a31281eccd (diff) | |
| download | linux-f52386892fb17b4a70a7a73240c0f04a0a6011a6.tar.gz linux-f52386892fb17b4a70a7a73240c0f04a0a6011a6.tar.bz2 linux-f52386892fb17b4a70a7a73240c0f04a0a6011a6.zip | |
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