Merge remote-tracking branches 'asoc/topic/nuc900', 'asoc/topic/omap', 'asoc/topic...

diff --cc arch/arm/mach-shmobile/board-lager.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r8a7778.c
Simple merge

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

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

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

diff --cc sound/soc/omap/ams-delta.c
index 669f84d9b76e7a02b4cf9e8308a4f822d5e951cb,56a5219c0a00587fc412caf76927adf4d11799a5,b0f8dbc1f635a7d5d7c93407b098c29ba969abcd,56a5219c0a00587fc412caf76927adf4d11799a5,56a5219c0a00587fc412caf76927adf4d11799a5,56a5219c0a00587fc412caf76927adf4d11799a5,56a5219c0a00587fc412caf76927adf4d11799a5..bb243c663e6bbe788dcedde60fa16c4eb1bca76a
--- 1/sound/soc/omap/ams-delta.c
--- 2/sound/soc/omap/ams-delta.c
--- 3/sound/soc/omap/ams-delta.c
--- 4/sound/soc/omap/ams-delta.c
--- 5/sound/soc/omap/ams-delta.c
--- 6/sound/soc/omap/ams-delta.c
--- 7/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@@@@@@@ -518,8 -520,29 -518,10 -520,29 -520,29 -520,29 -520,29 +518,8 @@@@@@@@ static int ams_delta_cx20442_init(struc
                return 0;
        }
       
 - ---- /* Add board specific DAPM widgets and routes */
 - ---- ret = snd_soc_dapm_new_controls(dapm, ams_delta_dapm_widgets,
 - ----                                 ARRAY_SIZE(ams_delta_dapm_widgets));
 - ---- if (ret) {
 - ----         dev_warn(card->dev,
 - ----                         "Failed to register DAPM controls, "
 - ----                         "will continue without any.\n");
 - ----         return 0;
 - ---- }
 - ----
 - ---- ret = snd_soc_dapm_add_routes(dapm, ams_delta_audio_map,
 - ----                                 ARRAY_SIZE(ams_delta_audio_map));
 - ---- if (ret) {
 - ----         dev_warn(card->dev,
 - ----                         "Failed to set up DAPM routes, "
 - ----                         "will continue with codec default map.\n");
 - ----         return 0;
 - ---- }
 - ----
        /* Set up initial pin constellation */
        snd_soc_dapm_disable_pin(dapm, "Mouthpiece");
 ------ snd_soc_dapm_enable_pin(dapm, "Earpiece");
 ------ snd_soc_dapm_enable_pin(dapm, "Microphone");
        snd_soc_dapm_disable_pin(dapm, "Speaker");
        snd_soc_dapm_disable_pin(dapm, "AGCIN");
        snd_soc_dapm_disable_pin(dapm, "AGCOUT");

diff --cc sound/soc/sh/rcar/core.c
Simple merge

diff --cc sound/soc/sh/rcar/src.c
Simple merge

diff --cc sound/soc/sh/rcar/ssi.c
Simple merge