Merge branch 'pm-clk' into pm-runtime
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 29 Nov 2014 00:18:27 +0000 (01:18 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 29 Nov 2014 00:18:27 +0000 (01:18 +0100)

Trivial merge