Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/cirrus', 'asoc/fix/da7213...

diff --combined MAINTAINERS
index 9e984645c4b08b9e20ebc839704a5d25b0c32032,f7d568b8f133d9919e3823c102d7ac78f89c894a,517829e3bd1dad3015039f629fc453417e19d4f0,f7d568b8f133d9919e3823c102d7ac78f89c894a,f7d568b8f133d9919e3823c102d7ac78f89c894a,f7d568b8f133d9919e3823c102d7ac78f89c894a..01dc6a4fb16c9c3ace0f90c76bc5f3a0af40ea81
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@ -846,6 -846,7 -846,7 -846,7 -846,7 -846,7 +846,6 @@@@@@@ M:     Laura Abbott <labbott@redhat.com
      M:        Sumit Semwal <sumit.semwal@linaro.org>
      L:        devel@driverdev.osuosl.org
      S:        Supported
 -----F:        Documentation/devicetree/bindings/staging/ion/
      F:        drivers/staging/android/ion
      F:        drivers/staging/android/uapi/ion.h
      F:        drivers/staging/android/uapi/ion_test.h
@@@@@@@ -3115,14 -3116,6 -3116,6 -3116,6 -3116,6 -3116,6 +3115,14 @@@@@@@ F:    drivers/net/ieee802154/cc2520.
      F:        include/linux/spi/cc2520.h
      F:        Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
      
 +++++CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER
 +++++M:        Gilad Ben-Yossef <gilad@benyossef.com>
 +++++L:        linux-crypto@vger.kernel.org
 +++++L:        driverdev-devel@linuxdriverproject.org
 +++++S:        Supported
 +++++F:        drivers/staging/ccree/
 +++++W:        https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
 +++++
      CEC FRAMEWORK
      M:        Hans Verkuil <hans.verkuil@cisco.com>
      L:        linux-media@vger.kernel.org
@@@@@@@ -5702,7 -5695,7 -5695,7 -5695,7 -5695,7 -5695,7 +5702,7 @@@@@@@ M:      Alex Elder <elder@kernel.org
      M:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      S:        Maintained
      F:        drivers/staging/greybus/
 -----L:        greybus-dev@lists.linaro.org
 +++++L:        greybus-dev@lists.linaro.org (moderated for non-subscribers)
      
      GREYBUS AUDIO PROTOCOLS DRIVERS
      M:        Vaibhav Agarwal <vaibhav.sr@gmail.com>
@@@@@@@ -9560,6 -9553,10 -9553,10 -9553,10 -9553,10 -9553,10 +9560,6 @@@@@@@ F: drivers/net/wireless/intersil/orinoc
      
      OSD LIBRARY and FILESYSTEM
      M:        Boaz Harrosh <ooo@electrozaur.com>
 -----M:        Benny Halevy <bhalevy@primarydata.com>
 -----L:        osd-dev@open-osd.org
 -----W:        http://open-osd.org
 -----T:        git git://git.open-osd.org/open-osd.git
      S:        Maintained
      F:        drivers/scsi/osd/
      F:        include/scsi/osd_*
@@@@@@@ -13861,7 -13858,7 -13858,7 -13858,7 -13858,7 -13858,7 +13861,7 @@@@@@@ S:       Odd fixe
      F:        drivers/net/wireless/wl3501*
      
      WOLFSON MICROELECTRONICS DRIVERS
-- ---L:        patches@opensource.wolfsonmicro.com
++ +++L:        patches@opensource.cirrus.com
      T:        git https://github.com/CirrusLogic/linux-drivers.git
      W:        https://github.com/CirrusLogic/linux-drivers/wiki
      S:        Supported