diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-25 22:16:09 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-25 22:16:09 +0200 |
commit | 7961bb722631cbf0cd68c57f3255ba66e1a879d9 (patch) | |
tree | 2b8f14636604ee9903f5495c52efa7033b603bca /MAINTAINERS | |
parent | 0f33be009b89d2268e94194dc4fd01a7851b6d51 (diff) | |
parent | cd8caa18deff6d2d87a4e3161b4dd8c6da3c4f38 (diff) | |
download | blackbird-op-linux-7961bb722631cbf0cd68c57f3255ba66e1a879d9.tar.gz blackbird-op-linux-7961bb722631cbf0cd68c57f3255ba66e1a879d9.zip |
Merge tag 'avs-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux into pm-avs
Pull AVS changes for v3.18 from Kevin Hilman:
- Add new driver for Rockchip IO voltage domains
- update MAINTAINERS to reflect maintenance of drivers/power/avs/*
* tag 'avs-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux:
MAINTAINERS: update entry for drivers/power/avs
PM / AVS: rockchip-io: add driver handling Rockchip io domains
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 670b3dcce2de..d40c922ec136 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8410,11 +8410,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 |