Merge branches 'fix/mxs', 'fix/omap', 'fix/samsung', 'fix/wm8978', 'topic/ak4104...

diff --cc sound/soc/codecs/Kconfig
index 80799639814e1f668a63ea0b871f38474a1a69ef,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,7015db265614f22e0f9e15a1407bb33ab5d23e38,b92759a3936157e0884b98f752935ccbef7b8945,6f4f2845f856ec9cdacfec3a93305f75bc71019b,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,f866e18e7876849d5f86d393db28ba2d2d19553e,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945..0e368d469764768ff7d113d13531e1d5c1f51ce6
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
--- 4/sound/soc/codecs/Kconfig
--- 5/sound/soc/codecs/Kconfig
--- 6/sound/soc/codecs/Kconfig
--- 7/sound/soc/codecs/Kconfig
--- 8/sound/soc/codecs/Kconfig
--- 9/sound/soc/codecs/Kconfig
--- 10/sound/soc/codecs/Kconfig
--- 11/sound/soc/codecs/Kconfig
--- 12/sound/soc/codecs/Kconfig
--- 13/sound/soc/codecs/Kconfig
--- 14/sound/soc/codecs/Kconfig
--- 15/sound/soc/codecs/Kconfig
--- 16/sound/soc/codecs/Kconfig
--- 17/sound/soc/codecs/Kconfig
--- 18/sound/soc/codecs/Kconfig
--- 19/sound/soc/codecs/Kconfig
--- 20/sound/soc/codecs/Kconfig
--- 21/sound/soc/codecs/Kconfig
--- 22/sound/soc/codecs/Kconfig
--- 23/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@@@@@@@@@@@@@@@@@@@ -146,13 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -147,6 -146,6 -146,6 -146,11 -146,6 -146,6 -146,6 -146,6 +147,13 @@@@@@@@@@@@@@@@@@@@@@@@ config SND_SOC_WM_HUB
                        default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y
                        default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m
                       
 +++++++++++++++++ ++++config SND_SOC_WM_ADSP
 +++++++++++++++++ ++++ tristate
 ++++++++++++++++++++++ default y if SND_SOC_WM5102=y
 +++++++++++++++++ ++++ default y if SND_SOC_WM2200=y
 ++++++++++++++++++++++ default m if SND_SOC_WM5102=m
 +++++++++++++++++ ++++ default m if SND_SOC_WM2200=m
 +++++++++++++++++ ++++
                       config SND_SOC_AB8500_CODEC
                        tristate
                       

diff --cc sound/soc/codecs/Makefile
Simple merge

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

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

diff --cc sound/soc/samsung/bells.c
Simple merge

diff --cc sound/soc/sh/fsi.c
index 9d7f30774a44d9524cb71f6697fc0ce96825295c,9d7f30774a44d9524cb71f6697fc0ce96825295c,9d7f30774a44d9524cb71f6697fc0ce96825295c,9d7f30774a44d9524cb71f6697fc0ce96825295c,9d7f30774a44d9524cb71f6697fc0ce96825295c,5328ae5539f16e67571566f313a5d9689f79cac5,9d7f30774a44d9524cb71f6697fc0ce96825295c,5328ae5539f16e67571566f313a5d9689f79cac5,5328ae5539f16e67571566f313a5d9689f79cac5,5328ae5539f16e67571566f313a5d9689f79cac5,bdaca356aaad6c669daa6f6234c925d471f645d3,9d7f30774a44d9524cb71f6697fc0ce96825295c,9d7f30774a44d9524cb71f6697fc0ce96825295c,9d7f30774a44d9524cb71f6697fc0ce96825295c,5328ae5539f16e67571566f313a5d9689f79cac5,5328ae5539f16e67571566f313a5d9689f79cac5,9d7f30774a44d9524cb71f6697fc0ce96825295c,9d7f30774a44d9524cb71f6697fc0ce96825295c,5328ae5539f16e67571566f313a5d9689f79cac5,5328ae5539f16e67571566f313a5d9689f79cac5,5328ae5539f16e67571566f313a5d9689f79cac5,5328ae5539f16e67571566f313a5d9689f79cac5,5328ae5539f16e67571566f313a5d9689f79cac5..4a10e4d1bd43b1b9bcb4062c1d67f7a403d83156
--- 1/sound/soc/sh/fsi.c
--- 2/sound/soc/sh/fsi.c
--- 3/sound/soc/sh/fsi.c
--- 4/sound/soc/sh/fsi.c
--- 5/sound/soc/sh/fsi.c
--- 6/sound/soc/sh/fsi.c
--- 7/sound/soc/sh/fsi.c
--- 8/sound/soc/sh/fsi.c
--- 9/sound/soc/sh/fsi.c
--- 10/sound/soc/sh/fsi.c
--- 11/sound/soc/sh/fsi.c
--- 12/sound/soc/sh/fsi.c
--- 13/sound/soc/sh/fsi.c
--- 14/sound/soc/sh/fsi.c
--- 15/sound/soc/sh/fsi.c
--- 16/sound/soc/sh/fsi.c
--- 17/sound/soc/sh/fsi.c
--- 18/sound/soc/sh/fsi.c
--- 19/sound/soc/sh/fsi.c
--- 20/sound/soc/sh/fsi.c
--- 21/sound/soc/sh/fsi.c
--- 22/sound/soc/sh/fsi.c
--- 23/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@@@@@@@@@@@@@@@@@@@@@@ -20,8 -20,8 -20,8 -20,8 -20,8 -20,7 -20,8 -20,7 -20,7 -20,7 -20,8 -20,8 -20,8 -20,8 -20,7 -20,7 -20,8 -20,8 -20,7 -20,7 -20,7 -20,7 -20,7 +20,9 @@@@@@@@@@@@@@@@@@@@@@@@
                       #include <linux/sh_dma.h>
                       #include <linux/slab.h>
                       #include <linux/module.h>
     + ++++   ++  +++++#include <linux/workqueue.h>
                       #include <sound/soc.h>
++++++++++ ++++++++++++#include <sound/pcm_params.h>
                       #include <sound/sh_fsi.h>
                       
                       /* PortA/PortB register */