Merge branch 'pm-clk'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Jan 2014 00:56:56 +0000 (01:56 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 17 Jan 2014 00:56:56 +0000 (01:56 +0100)
* pm-clk:
  PM / clock_ops: report clock errors from clk_enable()
  PM / clock_ops: check return of clk_enable() in pm_clk_resume()
  PM / clock_ops: fix up clk prepare/unprepare count


Trivial merge