Merge branch 'pm-opp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Dec 2014 20:23:13 +0000 (21:23 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Dec 2014 20:23:13 +0000 (21:23 +0100)
commite0288b0e9e2a5dbad612ef6c7dba1f9b52cef27f
tree1e7aad545ee41ff93d724930f2ed57bdaa5993d4
parentb7392d2247cfe6771f95d256374f1a8e6a6f48d6
parentb4718c02f49ab5e1452353f0fae78beabe81467c
Merge branch 'pm-opp'

* pm-opp:
  PM / OPP: take RCU lock in dev_pm_opp_get_opp_count
  PM / OPP: fix warning in of_free_opp_table()
  PM / OPP: add some lockdep annotations