From: Rafael J. Wysocki Date: Mon, 3 Jul 2017 12:21:33 +0000 (+0200) Subject: Merge branch 'pm-sleep' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=301f8d7463b1f3d1fdb56ee1cb4abb674094531d;p=linux.git 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 --- 301f8d7463b1f3d1fdb56ee1cb4abb674094531d