Merge branch 'pnp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Aug 2013 23:41:35 +0000 (01:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Aug 2013 23:41:35 +0000 (01:41 +0200)
commitce63e1862ce81d85df9e3239e4467ac765e04962
tree710af3f57b7fe25355088f8542f38a791b05b65d
parent8a3a53ea89251314338b03dad1ae2b5cc340350f
parenteaf140b60ec961252083ab8adaf67aef29a362dd
Merge branch 'pnp'

* pnp:
  PNP: convert PNP driver bus legacy pm_ops to dev_pm_ops