From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 27 Jul 2014 21:57:03 +0000 (+0200)
Subject: Merge branches 'pm-opp' and 'pm-general'
X-Git-Tag: v3.17-rc1~99^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7672b969b15b844bbfab1b4d7ecf40206aaf6602;p=thirdparty%2Fkernel%2Flinux.git

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

* pm-opp:
  PM / OPP: Remove ARCH_HAS_OPP

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

7672b969b15b844bbfab1b4d7ecf40206aaf6602