From: Rafael J. Wysocki Date: Sat, 29 Jun 2013 13:03:51 +0000 (+0200) Subject: Merge branch 'pm-assorted' X-Git-Tag: v3.11-rc1~101^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=867a420b222b25e9608f4430bea3af50835b56b5;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'pm-assorted' * pm-assorted: PM / Sleep: Warn about system time after resume with pm_trace --- 867a420b222b25e9608f4430bea3af50835b56b5