]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-cpuidle' into pm-sleep
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 6 May 2014 23:50:57 +0000 (01:50 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 6 May 2014 23:50:57 +0000 (01:50 +0200)

Trivial merge