summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorSebastian Reichel <sre@kernel.org>2018-04-26 12:18:30 +0200
committerSebastian Reichel <sre@kernel.org>2018-04-26 12:18:30 +0200
commit1f140ff467081212562327da6561edb6b3b3ed10 (patch)
treeda65d766f3501c3366bd12c2856b15af28fd60e9 /MAINTAINERS
parenta78c0c30ec73e90d1b5d8b06f593091d9b9f76d3 (diff)
parent0c718676ab3f02e98e85e7049e03d2879c62cb10 (diff)
downloadblackbird-op-linux-1f140ff467081212562327da6561edb6b3b3ed10.tar.gz
blackbird-op-linux-1f140ff467081212562327da6561edb6b3b3ed10.zip
Merge tag 'tags/tcpm-pps-4.18' into psy-next
Tag/Merge point for adding typeC power supply support This is a signed tag/merge point to handle the cross-tree merge of the USB and power supply subsystems for the patch series: Subject: [PATCH v8 0/6] typec: tcpm: Add sink side support for PPS It is based on the usb.git tree, in the usb-next branch, for merging in 4.18-rc1. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 92be777d060a..a93b8cfca489 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11270,6 +11270,7 @@ M: Sebastian Reichel <sre@kernel.org>
L: linux-pm@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git
S: Maintained
+F: Documentation/ABI/testing/sysfs-class-power
F: Documentation/devicetree/bindings/power/supply/
F: include/linux/power_supply.h
F: drivers/power/supply/
OpenPOWER on IntegriCloud