diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 17:05:14 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 17:05:14 +0200 |
commit | c55b2d989a5b2ef85ad28229484279ac7c2c412a (patch) | |
tree | 9a089c72523465a0c57439979b9ba8558f2efe0b /MAINTAINERS | |
parent | 7a4c66d0c10ccde344d723e40e0a6b3542ed5bc2 (diff) | |
parent | 832c927d119b5be3a01376b8e3033286eb5797e1 (diff) | |
download | linux-c55b2d989a5b2ef85ad28229484279ac7c2c412a.tar.gz linux-c55b2d989a5b2ef85ad28229484279ac7c2c412a.tar.bz2 linux-c55b2d989a5b2ef85ad28229484279ac7c2c412a.zip |
Merge tag 'xgene-drivers-for-4.9' of https://github.com/AppliedMicro/xgene-next into next/drivers
Pull "X-Gene driver changes queued for v4.9" from Duc Dang:
This patch set includes:
+ X-Gene SoC Performance Monitoring Unit (PMU) driver
* tag 'xgene-drivers-for-4.9' of https://github.com/AppliedMicro/xgene-next:
perf: xgene: Add APM X-Gene SoC Performance Monitoring Unit driver
Documentation: Add documentation for APM X-Gene SoC PMU DTS binding
MAINTAINERS: Add entry for APM X-Gene SoC PMU driver
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1cb3ce2db23c..2c207feda6d1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -856,6 +856,13 @@ F: drivers/net/phy/mdio-xgene.c F: Documentation/devicetree/bindings/net/apm-xgene-enet.txt F: Documentation/devicetree/bindings/net/apm-xgene-mdio.txt +APPLIED MICRO (APM) X-GENE SOC PMU +M: Tai Nguyen <ttnguyen@apm.com> +S: Supported +F: drivers/perf/xgene_pmu.c +F: Documentation/perf/xgene-pmu.txt +F: Documentation/devicetree/bindings/perf/apm-xgene-pmu.txt + APTINA CAMERA SENSOR PLL M: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> L: linux-media@vger.kernel.org |