Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ac97-mfd', 'asoc/topic...

diff --cc MAINTAINERS
index 2f4e462aa4a214d188bbed5aa612b60b34374448,1c3feffb1c1cfd2b46685907300a9f026fb67e6a,2281af4b41b6ce2000be7f3305db98475fdd7df6,2d3d750b19c0cddf8af39786faed78709f7bbba1,5824962f419f4f36aa51ed189b828d8f6a05328c..761aa3c063601f0e427dfd7b472fb5c132f60fa0
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@ -872,12 -840,6 -860,12 -872,12 -860,12 +872,12 @@@@@@ S: Supporte
     F: drivers/android/
     F: drivers/staging/android/
     
  ---M: Miodrag Dinic <miodrag.dinic@imgtec.com>
 +   ANDROID GOLDFISH RTC DRIVER
 ++++M: Miodrag Dinic <miodrag.dinic@mips.com>
 +   S: Supported
 +   F: Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt
 +   F: drivers/rtc/rtc-goldfish.c
 +   
     ANDROID ION DRIVER
     M: Laura Abbott <labbott@redhat.com>
     M: Sumit Semwal <sumit.semwal@linaro.org>
@@@@@@ -7570,17 -7446,6 -7558,17 -7570,17 -7558,17 +7570,17 @@@@@@ F:   arch/mips/include/uapi/asm/kvm
     F: arch/mips/include/asm/kvm*
     F: arch/mips/kvm/
     
  ---M: Alexander Graf <agraf@suse.com>
 +   KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
 ++++M: Paul Mackerras <paulus@ozlabs.org>
 +   L: kvm-ppc@vger.kernel.org
 +   W: http://www.linux-kvm.org/
 +   T: git git://github.com/agraf/linux-2.6.git
 +   S: Supported
 +   F: arch/powerpc/include/uapi/asm/kvm*
 +   F: arch/powerpc/include/asm/kvm*
 +   F: arch/powerpc/kvm/
 +   F: arch/powerpc/kernel/kvm*
 +   
     KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
     M: Christian Borntraeger <borntraeger@de.ibm.com>
     M: Cornelia Huck <cohuck@redhat.com>
@@@@@@ -8599,22 -8421,9 -8581,16 -8599,22 -8581,16 +8599,22 @@@@@@ F:   include/uapi/linux/meye.
     F: include/uapi/linux/ivtv*
     F: include/uapi/linux/uvcvideo.h
     
 +   MEDIATEK CIR DRIVER
 +   M: Sean Wang <sean.wang@mediatek.com>
 +   S: Maintained
 +   F: drivers/media/rc/mtk-cir.c
 +   
 ++ +MEDIATEK PMIC LED DRIVER
 ++ +M: Sean Wang <sean.wang@mediatek.com>
 ++ +S: Maintained
 ++ +F: drivers/leds/leds-mt6323.c
 ++ +F: Documentation/devicetree/bindings/leds/leds-mt6323.txt
 ++ +
     MEDIATEK ETHERNET DRIVER
     M: Felix Fietkau <nbd@openwrt.org>
 -   M: John Crispin <blogic@openwrt.org>
 +   M: John Crispin <john@phrozen.org>
 +   M: Sean Wang <sean.wang@mediatek.com>
 +   M: Nelson Chang <nelson.chang@mediatek.com>
     L: netdev@vger.kernel.org
     S: Maintained
     F: drivers/net/ethernet/mediatek/
@@@@@@ -8881,18 -8682,8 -8857,18 -8881,18 -8857,18 +8881,18 @@@@@@ F:   drivers/leds/leds-menf21bmc.
     F: drivers/hwmon/menf21bmc_hwmon.c
     F: Documentation/hwmon/menf21bmc
     
 +   MESON AO CEC DRIVER FOR AMLOGIC SOCS
 +   M: Neil Armstrong <narmstrong@baylibre.com>
 +   L: linux-media@lists.freedesktop.org
 +   L: linux-amlogic@lists.infradead.org
 +   W: http://linux-meson.com/
 +   S: Supported
 +   F: drivers/media/platform/meson/ao-cec.c
 +   F: Documentation/devicetree/bindings/media/meson-ao-cec.txt
 +   T: git git://linuxtv.org/media_tree.git
 +   
     METAG ARCHITECTURE
 -- -M: James Hogan <james.hogan@imgtec.com>
 ++ +M: James Hogan <jhogan@kernel.org>
     L: linux-metag@vger.kernel.org
     T: git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
     S: Odd Fixes
@@@@@@ -9018,13 -8802,6 -8994,13 -9018,13 -8994,13 +9018,13 @@@@@@ F:   arch/mips/include/asm/mach-loongson3
     F: drivers/*/*loongson1*
     F: drivers/*/*/*loongson1*
     
  ---M: Aleksandar Markovic <aleksandar.markovic@imgtec.com>
 +   MIPS RINT INSTRUCTION EMULATION
 ++++M: Aleksandar Markovic <aleksandar.markovic@mips.com>
 +   L: linux-mips@linux-mips.org
 +   S: Supported
 +   F: arch/mips/math-emu/sp_rint.c
 +   F: arch/mips/math-emu/dp_rint.c
 +   
     MIROSOUND PCM20 FM RADIO RECEIVER DRIVER
     M: Hans Verkuil <hverkuil@xs4all.nl>
     L: linux-media@vger.kernel.org
@@@@@@ -10178,7 -9945,8 -10155,8 -10179,8 -10155,8 +10178,7 @@@@@@ F:   include/uapi/linux/ppdev.
     F: Documentation/parport*.txt
     
     PARAVIRT_OPS INTERFACE
 -   M: Jeremy Fitzhardinge <jeremy@goop.org>
 -   M: Chris Wright <chrisw@sous-sol.org>
 +   M: Juergen Gross <jgross@suse.com>
  ---M: Chris Wright <chrisw@sous-sol.org>
     M: Alok Kataria <akataria@vmware.com>
     M: Rusty Russell <rusty@rustcorp.com.au>
     L: virtualization@lists.linux-foundation.org
@@@@@@ -12934,13 -12642,6 -12912,13 -12935,13 -12912,13 +12934,13 @@@@@@ L:     linux-mmc@vger.kernel.or
     S: Maintained
     F: drivers/mmc/host/dw_mmc*
     
  - -F: drivers/reset/reset-hsdk-v1.c
  - -F: include/dt-bindings/reset/snps,hsdk-v1-reset.h
  - -F: Documentation/devicetree/bindings/reset/snps,hsdk-v1-reset.txt
 +   SYNOPSYS HSDK RESET CONTROLLER DRIVER
 +   M: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
 +   S: Supported
 ++ +F: drivers/reset/reset-hsdk.c
 ++ +F: include/dt-bindings/reset/snps,hsdk-reset.h
 ++ +F: Documentation/devicetree/bindings/reset/snps,hsdk-reset.txt
 +   
     SYSTEM CONFIGURATION (SYSCON)
     M: Lee Jones <lee.jones@linaro.org>
     M: Arnd Bergmann <arnd@arndb.de>

diff --cc drivers/mfd/Makefile
Simple merge

diff --cc include/sound/pxa2xx-lib.h
Simple merge

diff --cc sound/Makefile
Simple merge

diff --cc sound/soc/amd/acp.h
Simple merge

diff --cc sound/soc/codecs/wm8998.c
Simple merge