Merge tag 'tags/tcpm-pps-4.18' into psy-next
authorSebastian Reichel <sre@kernel.org>
Thu, 26 Apr 2018 10:18:30 +0000 (12:18 +0200)
committerSebastian Reichel <sre@kernel.org>
Thu, 26 Apr 2018 10:18:30 +0000 (12:18 +0200)
commit1f140ff467081212562327da6561edb6b3b3ed10
treeda65d766f3501c3366bd12c2856b15af28fd60e9
parenta78c0c30ec73e90d1b5d8b06f593091d9b9f76d3
parent0c718676ab3f02e98e85e7049e03d2879c62cb10
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>
MAINTAINERS
drivers/power/supply/power_supply_sysfs.c