diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 23:57:03 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-27 23:57:03 +0200 |
| commit | 7672b969b15b844bbfab1b4d7ecf40206aaf6602 (patch) | |
| tree | 64252586015d73d76738107d1f5d5d2be8790899 /include/linux/debugobjects.h | |
| parent | Merge branches 'pm-apm' and 'pm-sleep' (diff) | |
| parent | PM / OPP: Remove ARCH_HAS_OPP (diff) | |
| parent | MAINTAINERS: power_supply: update maintainership (diff) | |
Merge branches 'pm-opp' and 'pm-general'
* pm-opp:
PM / OPP: Remove ARCH_HAS_OPP
* pm-general:
MAINTAINERS: power_supply: update maintainership