1 files changed, 12 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6892b26025ba..4e2a1f67a1fc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1280,7 +1280,7 @@ F:	Documentation/hwmon/asc7621
 F:      drivers/hwmon/asc7621.c
 
 ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
-M:      Corentin Chary <corentincj@iksaif.net>
+M:      Corentin Chary <corentin.chary@gmail.com>
 L:      acpi4asus-user@lists.sourceforge.net
 L:      platform-driver-x86@vger.kernel.org
 W:      http://acpi4asus.sf.net
@@ -1929,7 +1929,7 @@ F:	scripts/checkpatch.pl
 
 CHINESE DOCUMENTATION
 M:      Harry Wei <harryxiyou@gmail.com>
-L:      xiyoulinuxkernelgroup@googlegroups.com
+L:      xiyoulinuxkernelgroup@googlegroups.com (subscribers-only)
 L:      linux-kernel@zh-kernel.org (moderated for non-subscribers)
 S:      Maintained
 F:      Documentation/zh_CN/
@@ -2982,7 +2982,6 @@ L:	linux-ext4@vger.kernel.org
 S:      Maintained
 F:      Documentation/filesystems/ext3.txt
 F:      fs/ext3/
-F:      include/linux/ext3*
 
 EXT4 FILE SYSTEM
 M:      "Theodore Ts'o" <tytso@mit.edu>
@@ -3129,7 +3128,8 @@ W:	http://ieee1394.wiki.kernel.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git
 S:      Maintained
 F:      drivers/firewire/
-F:      include/linux/firewire*.h
+F:      include/linux/firewire.h
+F:      include/uapi/linux/firewire*.h
 F:      tools/firewire/
 
 FIRMWARE LOADER (request_firmware)
@@ -4314,7 +4314,6 @@ M:	Jan Kara <jack@suse.cz>
 L:      linux-ext4@vger.kernel.org
 S:      Maintained
 F:      fs/jbd/
-F:      include/linux/ext3_jbd.h
 F:      include/linux/jbd.h
 
 JOURNALLING LAYER FOR BLOCK DEVICES (JBD2)
@@ -6492,7 +6491,7 @@ F:	drivers/media/pci/saa7146/
 F:      include/media/saa7146*
 
 SAMSUNG LAPTOP DRIVER
-M:      Corentin Chary <corentincj@iksaif.net>
+M:      Corentin Chary <corentin.chary@gmail.com>
 L:      platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/samsung-laptop.c
@@ -7546,6 +7545,13 @@ S:	Maintained
 F:      sound/soc/codecs/lm49453*
 F:      sound/soc/codecs/isabelle*
 
+TI LP855x BACKLIGHT DRIVER
+M:      Milo Kim <milo.kim@ti.com>
+S:      Maintained
+F:      Documentation/backlight/lp855x-driver.txt
+F:      drivers/video/backlight/lp855x_bl.c
+F:      include/linux/platform_data/lp855x.h
+
 TI TWL4030 SERIES SOC CODEC DRIVER
 M:      Peter Ujfalusi <peter.ujfalusi@ti.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)