Merge branches 'pm-opp' and 'pm-general'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 27 Jul 2014 21:57:03 +0000 (23:57 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 27 Jul 2014 21:57:03 +0000 (23:57 +0200)
* pm-opp:
  PM / OPP: Remove ARCH_HAS_OPP

* pm-general:
  MAINTAINERS: power_supply: update maintainership

1  2  3 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge