Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc...

diff --combined MAINTAINERS
index ae6a717a30a46bb7666595c350dceb9405606805,03f49f490bed8c209697b95a531ce2bfa654f27c,7304d2e37a9827988f8c816c9d7922adb8a00d9b,7304d2e37a9827988f8c816c9d7922adb8a00d9b,7304d2e37a9827988f8c816c9d7922adb8a00d9b..75eab376e487bf6504283e90770d3b6f6001a586
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@ -595,10 -595,6 -595,6 -595,6 -595,6 +595,10 @@@@@@ S:    Odd Fixe
     L: linux-alpha@vger.kernel.org
     F: arch/alpha/
     
 ++++ALPS PS/2 TOUCHPAD DRIVER
 ++++R: Pali Rohár <pali.rohar@gmail.com>
 ++++F: drivers/input/mouse/alps.*
 ++++
     ALTERA MAILBOX DRIVER
     M: Ley Foon Tan <lftan@altera.com>
     L: nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
@@@@@@ -1163,7 -1159,6 -1159,6 -1159,6 -1159,6 +1163,7 @@@@@@ F:        arch/arm/mach-footbridge
     ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
     M: Shawn Guo <shawnguo@kernel.org>
     M: Sascha Hauer <kernel@pengutronix.de>
 ++++R: Fabio Estevam <fabio.estevam@nxp.com>
     L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
     S: Maintained
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@@@@@ -1608,7 -1603,6 -1603,7 -1603,7 -1603,7 +1608,6 @@@@@@ F:        drivers/*/*/*s3c2410
     F: drivers/memory/samsung/*
     F: drivers/soc/samsung/*
     F: drivers/spi/spi-s3c*
- ---F: sound/soc/samsung/*
     F: Documentation/arm/Samsung/
     F: Documentation/devicetree/bindings/arm/samsung/
     F: Documentation/devicetree/bindings/sram/samsung-sram.txt
@@@@@@ -1694,6 -1688,8 -1689,8 -1689,8 -1689,8 +1693,6 @@@@@@ S:        Maintaine
     F: drivers/edac/altera_edac.
     
     ARM/STI ARCHITECTURE
 ----M: Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
 ----M: Maxime Coquelin <maxime.coquelin@st.com>
     M: Patrice Chotard <patrice.chotard@st.com>
     L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
     L: kernel@stlinux.com
@@@@@@ -1726,7 -1722,6 -1723,6 -1723,6 -1723,6 +1725,7 @@@@@@ F:        drivers/ata/ahci_st.
     
     ARM/STM32 ARCHITECTURE
     M: Maxime Coquelin <mcoquelin.stm32@gmail.com>
 ++++M: Alexandre Torgue <alexandre.torgue@st.com>
     L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
     S: Maintained
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
@@@@@@ -2246,8 -2241,7 -2242,7 -2242,7 -2242,7 +2245,8 @@@@@@ F:        include/net/ax25.
     F: net/ax25/
     
     AZ6007 DVB DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -2714,8 -2708,7 -2709,7 -2709,7 -2709,7 +2713,8 @@@@@@ F:        Documentation/filesystems/btrfs.tx
     F: fs/btrfs/
     
     BTTV VIDEO4LINUX DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -2779,9 -2772,9 -2773,9 -2773,9 -2773,9 +2778,9 @@@@@@ F:        include/net/caif
     F: net/caif/
     
     CALGARY x86-64 IOMMU
 ----M: Muli Ben-Yehuda <muli@il.ibm.com>
 ----M: "Jon D. Mason" <jdmason@kudzu.us>
 ----L: discuss@x86-64.org
 ++++M: Muli Ben-Yehuda <mulix@mulix.org>
 ++++M: Jon Mason <jdmason@kudzu.us>
 ++++L: iommu@lists.linux-foundation.org
     S: Maintained
     F: arch/x86/kernel/pci-calgary_64.c
     F: arch/x86/kernel/tce_64.c
@@@@@@ -3092,7 -3085,6 -3086,6 -3086,6 -3086,6 +3091,7 @@@@@@ M:        Stephen Boyd <sboyd@codeaurora.org
     L: linux-clk@vger.kernel.org
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
     S: Maintained
 ++++F: Documentation/devicetree/bindings/clock/
     F: drivers/clk/
     X: drivers/clk/clkdev.c
     F: include/linux/clk-pr*
@@@@@@ -3350,8 -3342,7 -3343,7 -3343,7 -3343,7 +3349,8 @@@@@@ S:        Maintaine
     F: drivers/media/dvb-frontends/cx24120*
     
     CX88 VIDEO4LINUX DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -3781,7 -3772,6 -3773,6 -3773,6 -3773,6 +3780,7 @@@@@@ Q:        https://patchwork.kernel.org/project
     S: Maintained
     F: drivers/dma/
     F: include/linux/dmaengine.h
 ++++F: Documentation/devicetree/bindings/dma/
     F: Documentation/dmaengine/
     T: git git://git.infradead.org/users/vkoul/slave-dma.git
     
@@@@@@ -4299,8 -4289,7 -4290,7 -4290,7 -4290,7 +4298,8 @@@@@@ F:        fs/ecryptfs
     EDAC-CORE
     M: Doug Thompson <dougthompson@xmission.com>
     M: Borislav Petkov <bp@alien8.de>
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-edac@vger.kernel.org
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
@@@@@@ -4345,8 -4334,7 -4335,7 -4335,7 -4335,7 +4344,8 @@@@@@ S:        Maintaine
     F: drivers/edac/e7xxx_edac.c
     
     EDAC-GHES
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-edac@vger.kernel.org
     S: Maintained
     F: drivers/edac/ghes_edac.c
@@@@@@ -4370,22 -4358,19 -4359,19 -4359,19 -4359,19 +4369,22 @@@@@@ S:  Maintaine
     F: drivers/edac/i5000_edac.c
     
     EDAC-I5400
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-edac@vger.kernel.org
     S: Maintained
     F: drivers/edac/i5400_edac.c
     
     EDAC-I7300
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-edac@vger.kernel.org
     S: Maintained
     F: drivers/edac/i7300_edac.c
     
     EDAC-I7CORE
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-edac@vger.kernel.org
     S: Maintained
     F: drivers/edac/i7core_edac.c
@@@@@@ -4422,8 -4407,7 -4408,7 -4408,7 -4408,7 +4421,8 @@@@@@ S:        Maintaine
     F: drivers/edac/r82600_edac.c
     
     EDAC-SBRIDGE
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-edac@vger.kernel.org
     S: Maintained
     F: drivers/edac/sb_edac.c
@@@@@@ -4476,14 -4460,13 -4461,13 -4461,13 -4461,13 +4475,14 @@@@@@ S:  Orpha
     F: fs/efs/
     
     EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
 ----M: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
 ++++M: Douglas Miller <dougmill@linux.vnet.ibm.com>
     L: netdev@vger.kernel.org
     S: Maintained
     F: drivers/net/ethernet/ibm/ehea/
     
     EM28XX VIDEO4LINUX DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -6502,7 -6485,6 -6486,6 -6486,6 -6486,6 +6501,7 @@@@@@ F:        include/uapi/linux/sunrpc
     
     KERNEL SELFTEST FRAMEWORK
     M: Shuah Khan <shuahkh@osg.samsung.com>
 ++++M: Shuah Khan <shuah@kernel.org>
     L: linux-kselftest@vger.kernel.org
     T: git git://git.kernel.org/pub/scm/shuah/linux-kselftest
     S: Maintained
@@@@@@ -7270,13 -7252,6 -7253,6 -7253,6 -7253,6 +7269,13 @@@@@@ F:      Documentation/devicetree/bindings/i2
     F: drivers/hwmon/max6697.c
     F: include/linux/platform_data/max6697.h
     
 ++++MAX9860 MONO AUDIO VOICE CODEC DRIVER
 ++++M: Peter Rosin <peda@axentia.se>
 ++++L: alsa-devel@alsa-project.org (moderated for non-subscribers)
 ++++S: Maintained
 ++++F: Documentation/devicetree/bindings/sound/max9860.txt
 ++++F: sound/soc/codecs/max9860.*
 ++++
     MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
     M: Krzysztof Kozlowski <k.kozlowski@samsung.com>
     L: linux-pm@vger.kernel.org
@@@@@@ -7381,8 -7356,7 -7357,7 -7357,7 -7357,7 +7380,8 @@@@@@ S:        Supporte
     F: drivers/media/pci/netup_unidvb/*
     
     MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     P: LinuxTV.org Project
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
@@@@@@ -7430,7 -7404,7 -7405,7 -7405,7 -7405,7 +7429,7 @@@@@@ F:        drivers/scsi/megaraid.
     F: drivers/scsi/megaraid/
     
     MELLANOX ETHERNET DRIVER (mlx4_en)
 ----M:         Eugenia Emantayev <eugenia@mellanox.com>
 ++++M: Tariq Toukan <tariqt@mellanox.com>
     L: netdev@vger.kernel.org
     S: Supported
     W: http://www.mellanox.com
@@@@@@ -7482,7 -7456,6 -7457,6 -7457,6 -7457,6 +7481,7 @@@@@@ Q:        http://patchwork.ozlabs.org/project/
     T: git git://git.infradead.org/linux-mtd.git
     T: git git://git.infradead.org/l2-mtd.git
     S: Maintained
 ++++F: Documentation/devicetree/bindings/mtd/
     F: drivers/mtd/
     F: include/linux/mtd/
     F: include/uapi/mtd/
@@@@@@ -8015,7 -7988,6 -7989,6 -7989,6 -7989,6 +8014,7 @@@@@@ Q:        http://patchwork.ozlabs.org/project/
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
     S: Odd Fixes
 ++++F: Documentation/devicetree/bindings/net/
     F: drivers/net/
     F: include/linux/if_*
     F: include/linux/netdevice.h
@@@@@@ -8034,7 -8006,6 -8007,6 -8007,6 -8007,6 +8033,7 @@@@@@ Q:        http://patchwork.kernel.org/project/
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
     S: Maintained
 ++++F: Documentation/devicetree/bindings/net/wireless/
     F: drivers/net/wireless/
     
     NETXEN (1/10) GbE SUPPORT
@@@@@@ -8432,9 -8403,10 -8404,10 -8404,10 -8404,10 +8431,9 @@@@@@ F:    drivers/i2c/busses/i2c-ocores.
     OPEN FIRMWARE AND FLATTENED DEVICE TREE
     M: Rob Herring <robh+dt@kernel.org>
     M: Frank Rowand <frowand.list@gmail.com>
 ----M: Grant Likely <grant.likely@linaro.org>
     L: devicetree@vger.kernel.org
     W: http://www.devicetree.org/
 ----T: git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git
 ++++T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
     S: Maintained
     F: drivers/of/
     F: include/linux/of*.h
@@@@@@ -8442,10 -8414,12 -8415,12 -8415,12 -8415,12 +8441,10 @@@@@@ F:  scripts/dtc
     
     OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
     M: Rob Herring <robh+dt@kernel.org>
 ----M: Pawel Moll <pawel.moll@arm.com>
     M: Mark Rutland <mark.rutland@arm.com>
 ----M: Ian Campbell <ijc+devicetree@hellion.org.uk>
 ----M: Kumar Gala <galak@codeaurora.org>
     L: devicetree@vger.kernel.org
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
 ++++Q: http://patchwork.ozlabs.org/project/devicetree-bindings/list/
     S: Maintained
     F: Documentation/devicetree/
     F: arch/*/boot/dts/
@@@@@@ -8969,8 -8943,6 -8944,6 -8944,6 -8944,6 +8968,8 @@@@@@ M:        Linus Walleij <linus.walleij@linaro.
     L: linux-gpio@vger.kernel.org
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
     S: Maintained
 ++++F: Documentation/devicetree/bindings/pinctrl/
 ++++F: Documentation/pinctrl.txt
     F: drivers/pinctrl/
     F: include/linux/pinctrl/
     
@@@@@@ -9878,8 -9850,7 -9851,7 -9851,7 -9851,7 +9877,8 @@@@@@ S:        Odd Fixe
     F: drivers/media/i2c/saa6588*
     
     SAA7134 VIDEO4LINUX DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -9903,7 -9874,9 -9875,7 -9875,7 -9875,7 +9902,9 @@@@@@ S:        Maintaine
     F: drivers/platform/x86/samsung-laptop.c
     
     SAMSUNG AUDIO (ASoC) DRIVERS
+ +++M: Krzysztof Kozlowski <k.kozlowski@samsung.com>
     M: Sangbeom Kim <sbkim73@samsung.com>
+ +++M: Sylwester Nawrocki <s.nawrocki@samsung.com>
     L: alsa-devel@alsa-project.org (moderated for non-subscribers)
     S: Supported
     F: sound/soc/samsung/
@@@@@@ -10398,8 -10371,7 -10370,7 -10370,7 -10370,7 +10399,8 @@@@@@ S:  Maintaine
     F: drivers/media/radio/si4713/radio-usb-si4713.c
     
     SIANO DVB DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -10731,7 -10703,6 -10702,6 -10702,6 -10702,6 +10732,7 @@@@@@ T:  git git://git.kernel.org/pub/scm/lin
     L: alsa-devel@alsa-project.org (moderated for non-subscribers)
     W: http://alsa-project.org/main/index.php/ASoC
     S: Supported
 ++++F: Documentation/devicetree/bindings/sound/
     F: Documentation/sound/alsa/soc/
     F: sound/soc/
     F: include/sound/soc*
@@@@@@ -11166,8 -11137,7 -11136,7 -11136,7 -11136,7 +11167,8 @@@@@@ S:  Maintaine
     F: drivers/media/i2c/tda9840*
     
     TEA5761 TUNER DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -11175,8 -11145,7 -11144,7 -11144,7 -11144,7 +11176,8 @@@@@@ S:  Odd fixe
     F: drivers/media/tuners/tea5761.*
     
     TEA5767 TUNER DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -11563,8 -11532,7 -11531,7 -11531,7 -11531,7 +11564,8 @@@@@@ F:  include/linux/shmem_fs.
     F: mm/shmem.c
     
     TM6000 VIDEO4LINUX DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git
@@@@@@ -11918,8 -11886,7 -11885,7 -11885,7 -11885,7 +11919,8 @@@@@@ F:  drivers/usb/common/usb-otg-fsm.
     
     USB OVER IP DRIVER
     M: Valentina Manea <valentina.manea.m@gmail.com>
 ----M: Shuah Khan <shuah.kh@samsung.com>
 ++++M: Shuah Khan <shuahkh@osg.samsung.com>
 ++++M: Shuah Khan <shuah@kernel.org>
     L: linux-usb@vger.kernel.org
     S: Maintained
     F: Documentation/usb/usbip_protocol.txt
@@@@@@ -11990,7 -11957,6 -11956,6 -11956,6 -11956,6 +11991,7 @@@@@@ L:  linux-usb@vger.kernel.or
     W: http://www.linux-usb.org
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
     S: Supported
 ++++F: Documentation/devicetree/bindings/usb/
     F: Documentation/usb/
     F: drivers/usb/
     F: include/linux/usb.h
@@@@@@ -12164,7 -12130,6 -12129,6 -12129,6 -12129,6 +12165,7 @@@@@@ VIRTIO CORE, NET AND BLOCK DRIVER
     M: "Michael S. Tsirkin" <mst@redhat.com>
     L: virtualization@lists.linux-foundation.org
     S: Maintained
 ++++F: Documentation/devicetree/bindings/virtio/
     F: drivers/virtio/
     F: tools/virtio/
     F: drivers/net/virtio_net.c
@@@@@@ -12553,8 -12518,7 -12517,7 -12517,7 -12517,7 +12554,8 @@@@@@ S:  Maintaine
     F: arch/x86/entry/vdso/
     
     XC2028/3028 TUNER DRIVER
 ----M: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 ++++M: Mauro Carvalho Chehab <mchehab@s-opensource.com>
 ++++M: Mauro Carvalho Chehab <mchehab@kernel.org>
     L: linux-media@vger.kernel.org
     W: https://linuxtv.org
     T: git git://linuxtv.org/media_tree.git