diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-27 21:13:33 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-27 21:13:33 -0400 |
| commit | 78da02186a5a7cd813321ef018a1c6dbaf888722 (patch) | |
| tree | f580c6d9c70389c7cc9cb5d659294e5077b0e412 | |
| parent | 78040b630f28298e0ecb56bf1bc53c7976314eab (diff) | |
| parent | cd2d95d97c8d1b66467507400c63d707ddb1deba (diff) | |
Merge remote-tracking branch 'regulator/fix/core' into v3.9-rc8
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8bdd7a7ef2f4..c2d345896839 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -8712,7 +8712,7 @@ F: drivers/scsi/vmw_pvscsi.c | |||
| 8712 | F: drivers/scsi/vmw_pvscsi.h | 8712 | F: drivers/scsi/vmw_pvscsi.h |
| 8713 | 8713 | ||
| 8714 | VOLTAGE AND CURRENT REGULATOR FRAMEWORK | 8714 | VOLTAGE AND CURRENT REGULATOR FRAMEWORK |
| 8715 | M: Liam Girdwood <lrg@ti.com> | 8715 | M: Liam Girdwood <lgirdwood@gmail.com> |
| 8716 | M: Mark Brown <broonie@kernel.org> | 8716 | M: Mark Brown <broonie@kernel.org> |
| 8717 | W: http://opensource.wolfsonmicro.com/node/15 | 8717 | W: http://opensource.wolfsonmicro.com/node/15 |
| 8718 | W: http://www.slimlogic.co.uk/?p=48 | 8718 | W: http://www.slimlogic.co.uk/?p=48 |