diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-07 01:18:38 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-07 01:18:38 +0200 |
| commit | 4734c6efc8c691fda80f11ae00016bc3a8d9ebb5 (patch) | |
| tree | ff27c54c0d9787e3321a8591005b356ea2305ecc /MAINTAINERS | |
| parent | 0f4685d0ec9aa1db99f014f8f774518cae085aca (diff) | |
| parent | 7961bb722631cbf0cd68c57f3255ba66e1a879d9 (diff) | |
Merge branch 'pm-avs'
* pm-avs:
MAINTAINERS: update entry for drivers/power/avs
PM / AVS: rockchip-io: add driver handling Rockchip io domains
regulator: core: Add REGULATOR_EVENT_PRE_VOLTAGE_CHANGE (and ABORT)
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f10ed3914ea8..fbafc94ac9ae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8414,11 +8414,11 @@ S: Maintained F: Documentation/security/Smack.txt F: security/smack/ -SMARTREFLEX DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS) +DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS) M: Kevin Hilman <khilman@kernel.org> M: Nishanth Menon <nm@ti.com> S: Maintained -F: drivers/power/avs/smartreflex.c +F: drivers/power/avs/ F: include/linux/power/smartreflex.h L: linux-pm@vger.kernel.org |