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)
commit7672b969b15b844bbfab1b4d7ecf40206aaf6602
tree64252586015d73d76738107d1f5d5d2be8790899
parentbb1c095f7367bbf4983dbee32b2f83f59df3b310
parent78c5e0bb145d3eac719fcad1ac1df763a71cf632
parentad8464a2f31a54560b17d5fc6b1cca5fa68de83d
Merge branches 'pm-opp' and 'pm-general'

* pm-opp:
  PM / OPP: Remove ARCH_HAS_OPP

* pm-general:
  MAINTAINERS: power_supply: update maintainership
MAINTAINERS