Pull misc-for-upstream into release branch

Conflicts:

	drivers/usb/misc/appledisplay.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b0fd71b3f66f..5a546e594567 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -247,6 +247,13 @@ L:	linux-acpi@vger.kernel.org
 W:      http://acpi.sourceforge.net/
 S:      Supported
 
+ACPI VIDEO DRIVER
+P:      Luming Yu
+M:      luming.yu@intel.com
+L:      linux-acpi@vger.kernel.org
+W:      http://acpi.sourceforge.net/
+S:      Supported
+
 AD1816 SOUND DRIVER
 P:      Thorsten Knabe
 M:      Thorsten Knabe <linux@thorsten-knabe.de>