Merge branch 'pm-assorted'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 29 Jun 2013 13:03:51 +0000 (15:03 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 29 Jun 2013 13:03:51 +0000 (15:03 +0200)
commit867a420b222b25e9608f4430bea3af50835b56b5
treed251c69f5a29721e6d4966ccd0d0cb45f9114b30
parent5c0b1b2003362c9015ee3324816c0966efaa0f88
parent9dceefe483d7640ba0bbf3e53d1db880e7469aba
Merge branch 'pm-assorted'

* pm-assorted:
  PM / Sleep: Warn about system time after resume with pm_trace