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)
commit380062bd66dc65287a3e9f937bc0dee2c434d25d
tree2dd8ee2f4c598a21bf7eed2b3af96dd91dc08bd6
parent9612a461c1e48f75ca1e1f0faf9c928761baae5b
parent5cda3fbb155bff96c971d058ed040d5c85612fd8
Merge branch 'pm-clk'

* 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