summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-27 23:57:03 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-27 23:57:03 +0200
commit7672b969b15b844bbfab1b4d7ecf40206aaf6602 (patch)
tree64252586015d73d76738107d1f5d5d2be8790899 /kernel/power
parentMerge branches 'pm-apm' and 'pm-sleep' (diff)
parentPM / OPP: Remove ARCH_HAS_OPP (diff)
parentMAINTAINERS: power_supply: update maintainership (diff)
downloadlinux-7672b969b15b844bbfab1b4d7ecf40206aaf6602.tar.xz
linux-7672b969b15b844bbfab1b4d7ecf40206aaf6602.zip
Merge branches 'pm-opp' and 'pm-general'
* pm-opp: PM / OPP: Remove ARCH_HAS_OPP * pm-general: MAINTAINERS: power_supply: update maintainership