diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-30 08:50:25 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-30 08:50:25 -0400 |
commit | 74a0f24bb6f9e29ea1223f363ca2ed36d082e1b9 (patch) | |
tree | 751fabf14bc922c7a994ebb836759c4654bb81d0 | |
parent | 4d93b0253caf7b9947c309652fe670340240b6f0 (diff) | |
parent | 5cdeb2c837ddcf5b67692816952d0f38e29c2d7b (diff) |
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 37054306dc9f..4c6c341bc9c7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -9895,6 +9895,7 @@ F: drivers/scsi/vmw_pvscsi.h | |||
9895 | VOLTAGE AND CURRENT REGULATOR FRAMEWORK | 9895 | VOLTAGE AND CURRENT REGULATOR FRAMEWORK |
9896 | M: Liam Girdwood <lgirdwood@gmail.com> | 9896 | M: Liam Girdwood <lgirdwood@gmail.com> |
9897 | M: Mark Brown <broonie@kernel.org> | 9897 | M: Mark Brown <broonie@kernel.org> |
9898 | L: linux-kernel@vger.kernel.org | ||
9898 | W: http://opensource.wolfsonmicro.com/node/15 | 9899 | W: http://opensource.wolfsonmicro.com/node/15 |
9899 | W: http://www.slimlogic.co.uk/?p=48 | 9900 | W: http://www.slimlogic.co.uk/?p=48 |
9900 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git | 9901 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git |