Merge remote-tracking branches 'asoc/fix/db1200', 'asoc/fix/dwc', 'asoc/fix/imx-ssi...

diff --cc MAINTAINERS
index 797236befd279bef6bf7c0c074b132d4bf6f9380,7ba7ab749c853a7691dff808d85b2a8f80973fe6,7ba7ab749c853a7691dff808d85b2a8f80973fe6,7ba7ab749c853a7691dff808d85b2a8f80973fe6,07790dfa22c53e926642ef044c27b635d64f35b6,7ba7ab749c853a7691dff808d85b2a8f80973fe6,7ba7ab749c853a7691dff808d85b2a8f80973fe6,7ba7ab749c853a7691dff808d85b2a8f80973fe6..60aacd88bd7f57240b9a677dd29dee1e02390dc9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
--- 5/MAINTAINERS
--- 6/MAINTAINERS
--- 7/MAINTAINERS
--- 8/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@@@@ -11378,19 -11364,21 -11364,21 -11364,21 -11363,10 -11364,21 -11364,21 -11364,21 +11378,10 @@@@@@@@@ W:        http://oops.ghostprotocols.net:81/bl
        S:      Maintained
        F:      drivers/net/wireless/wl3501*
        
---- ---WM97XX TOUCHSCREEN DRIVERS
---- ---M:      Mark Brown <broonie@kernel.org>
---- ---M:      Liam Girdwood <lrg@slimlogic.co.uk>
---- ---L:      linux-input@vger.kernel.org
-       W:      https://github.com/CirrusLogic/linux-drivers/wiki
 --- ---T:      git git://opensource.wolfsonmicro.com/linux-2.6-touch
 --- ---W:      http://opensource.wolfsonmicro.com/node/7
---- ---S:      Supported
---- ---F:      drivers/input/touchscreen/*wm97*
---- ---F:      include/linux/wm97xx.h
---- ---
        WOLFSON MICROELECTRONICS DRIVERS
        L:      patches@opensource.wolfsonmicro.com
 --- ---T:      git git://opensource.wolfsonmicro.com/linux-2.6-asoc
 --- ---T:      git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 --- ---W:      http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
 +++ +++T:      git https://github.com/CirrusLogic/linux-drivers.git
 +++ +++W:      https://github.com/CirrusLogic/linux-drivers/wiki
        S:      Supported
        F:      Documentation/hwmon/wm83??
        F:      arch/arm/mach-s3c64xx/mach-crag6410*

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