Merge branches 'pm-opp' and 'pm-general'

* pm-opp:
  PM / OPP: Remove ARCH_HAS_OPP

* pm-general:
  MAINTAINERS: power_supply: update maintainership
This commit is contained in:
Rafael J. Wysocki
2014-07-27 23:57:03 +02:00
11 changed files with 2 additions and 15 deletions

View File

@@ -253,9 +253,6 @@ config APM_EMULATION
anything, try disabling/enabling this option (or disabling/enabling
APM in your BIOS).
config ARCH_HAS_OPP
bool
config PM_OPP
bool
---help---