Merge tag 'powerpc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[mirror_ubuntu-zesty-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 256f56bbb2ad26cd345be9100a3fa9b0878ecf46..8af18097e92c9be5671385195d61dc01d06d7580 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6948,6 +6948,7 @@ F:        drivers/crypto/nx/
 F:     drivers/crypto/vmx/
 F:     drivers/net/ethernet/ibm/ibmveth.*
 F:     drivers/net/ethernet/ibm/ibmvnic.*
+F:     drivers/pci/hotplug/pnv_php.c
 F:     drivers/pci/hotplug/rpa*
 F:     drivers/scsi/ibmvscsi/
 N:     opal
@@ -9214,6 +9215,12 @@ F:       drivers/firmware/psci.c
 F:     include/linux/psci.h
 F:     include/uapi/linux/psci.h
 
+POWERNV OPERATOR PANEL LCD DISPLAY DRIVER
+M:     Suraj Jitindar Singh <sjitindarsingh@gmail.com>
+L:     linuxppc-dev@lists.ozlabs.org
+S:     Maintained
+F:     drivers/char/powernv-op-panel.c
+
 PNP SUPPORT
 M:     "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 S:     Maintained