Merge branch 'pm-sleep'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 3 Jul 2017 12:21:33 +0000 (14:21 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 3 Jul 2017 12:21:33 +0000 (14:21 +0200)
commit301f8d7463b1f3d1fdb56ee1cb4abb674094531d
treef3aa2695f655a6b628634c14d6de88b1992151e3
parentf1c7842e5fdd81363643debcd04c5e9b9a55325a
parent59494fe2c89e46e85d83de9bc45dd1d528955c49
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