]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
projects / linux-imx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c0b1b2 9dceefe)
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)
* pm-assorted:
  PM / Sleep: Warn about system time after resume with pm_trace


Trivial merge
Local Linux development repo for Freescale iMX