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

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge

diff --cc sound/soc/codecs/Kconfig
index 80799639814e1f668a63ea0b871f38474a1a69ef,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,b92759a3936157e0884b98f752935ccbef7b8945,7015db265614f22e0f9e15a1407bb33ab5d23e38,b92759a3936157e0884b98f752935ccbef7b8945,6f4f2845f856ec9cdacfec3a93305f75bc71019b,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
+++ 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 -147,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
Simple merge