]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pnp-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 4 Aug 2013 21:52:35 +0000 (23:52 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 4 Aug 2013 21:52:35 +0000 (23:52 +0200)
* pnp-next:
  PNP: convert PNP driver bus legacy pm_ops to dev_pm_ops


Trivial merge