Merge tag 'media/v4.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 10074ff03c574322526868e38aa8d949d852541c..bafc8043d4f0df1858f9220ebdab17e932bf4bbc 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -778,6 +778,11 @@ W: http://ez.analog.com/community/linux-device-drivers
 S:     Supported
 F:     drivers/dma/dma-axi-dmac.c
 
+ANDROID CONFIG FRAGMENTS
+M:     Rob Herring <robh@kernel.org>
+S:     Supported
+F:     kernel/configs/android*
+
 ANDROID DRIVERS
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 M:     Arve Hjønnevåg <arve@android.com>
@@ -1643,7 +1648,8 @@ F:        arch/arm/mach-s5pv210/
 
 ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
 M:     Kyungmin Park <kyungmin.park@samsung.com>
-M:     Kamil Debski <k.debski@samsung.com>
+M:     Kamil Debski <kamil@wypas.org>
+M:     Andrzej Hajda <a.hajda@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org
 L:     linux-media@vger.kernel.org
 S:     Maintained
@@ -1651,8 +1657,9 @@ F:        drivers/media/platform/s5p-g2d/
 
 ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 M:     Kyungmin Park <kyungmin.park@samsung.com>
-M:     Kamil Debski <k.debski@samsung.com>
+M:     Kamil Debski <kamil@wypas.org>
 M:     Jeongtae Park <jtp.park@samsung.com>
+M:     Andrzej Hajda <a.hajda@samsung.com>
 L:     linux-arm-kernel@lists.infradead.org
 L:     linux-media@vger.kernel.org
 S:     Maintained
@@ -2346,7 +2353,10 @@ S:       Supported
 F:     drivers/media/platform/sti/bdisp
 
 BEFS FILE SYSTEM
-S:     Orphan
+M:     Luis de Bethencourt <luisbg@osg.samsung.com>
+M:     Salah Triki <salah.triki@gmail.com>
+S:     Maintained
+T:     git git://github.com/luisbg/linux-befs.git
 F:     Documentation/filesystems/befs.txt
 F:     fs/befs/
 
@@ -8264,8 +8274,9 @@ T:        git git://github.com/konis/nilfs2.git
 S:     Supported
 F:     Documentation/filesystems/nilfs2.txt
 F:     fs/nilfs2/
-F:     include/linux/nilfs2_fs.h
 F:     include/trace/events/nilfs2.h
+F:     include/uapi/linux/nilfs2_api.h
+F:     include/uapi/linux/nilfs2_ondisk.h
 
 NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/CardBus) PCMCIA SCSI HOST ADAPTER DRIVER
 M:     YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
@@ -9461,7 +9472,8 @@ S:        Odd Fixes
 F:     drivers/media/usb/pwc/*
 
 PWM FAN DRIVER
-M:     Kamil Debski <k.debski@samsung.com>
+M:     Kamil Debski <kamil@wypas.org>
+M:     Lukasz Majewski <l.majewski@samsung.com>
 L:     linux-hwmon@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/hwmon/pwm-fan.txt
@@ -10209,7 +10221,8 @@ T:      git https://github.com/lmajewski/linux-samsung-thermal.git
 F:     drivers/thermal/samsung/
 
 SAMSUNG USB2 PHY DRIVER
-M:     Kamil Debski <k.debski@samsung.com>
+M:     Kamil Debski <kamil@wypas.org>
+M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/phy/samsung-phy.txt