diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-13 09:22:57 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-13 09:22:57 -0400 |
| commit | 170b649e40c0dac86eba6bd446fc79dd3b38c7ea (patch) | |
| tree | 8854bdb0d2cff87d8c1a6eeea69d4b25641cc07b /MAINTAINERS | |
| parent | 75941a1ba32d36fe6230a6388f10c493b3f6232b (diff) | |
| parent | de4a54c4dfaed0604565c1b27488dce56997acc0 (diff) | |
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a727d9959ecd..fce0ba53ec82 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -11997,7 +11997,9 @@ L: linux-kernel@vger.kernel.org | |||
| 11997 | W: http://www.slimlogic.co.uk/?p=48 | 11997 | W: http://www.slimlogic.co.uk/?p=48 |
| 11998 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git | 11998 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git |
| 11999 | S: Supported | 11999 | S: Supported |
| 12000 | F: Documentation/devicetree/bindings/regulator/ | ||
| 12000 | F: drivers/regulator/ | 12001 | F: drivers/regulator/ |
| 12002 | F: include/dt-bindings/regulator/ | ||
| 12001 | F: include/linux/regulator/ | 12003 | F: include/linux/regulator/ |
| 12002 | 12004 | ||
| 12003 | VRF | 12005 | VRF |