| commit | 301f8d7463b1f3d1fdb56ee1cb4abb674094531d | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Mon Jul 03 14:21:33 2017 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Mon Jul 03 14:21:33 2017 +0200 |
| tree | f3aa2695f655a6b628634c14d6de88b1992151e3 | |
| parent | f1c7842e5fdd81363643debcd04c5e9b9a55325a [diff] | |
| parent | 59494fe2c89e46e85d83de9bc45dd1d528955c49 [diff] |
Merge branch 'pm-sleep' * pm-sleep: PM: hibernate: constify attribute_group structures. PM / hibernate: Drop redundant parameter of swsusp_alloc() PM / hibernate: Use CONFIG_HAVE_SET_MEMORY for include condition x86/power/64: Use char arrays for asm function names