Merge branch 'topic/workq-update' into topic/asoc

Conflicts:
	sound/soc/codecs/wm8350.c
	sound/soc/codecs/wm8753.c
	sound/soc/sh/fsi.c
	sound/soc/soc-core.c

diff --cc MAINTAINERS
Simple merge

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

diff --cc arch/sh/boards/mach-se/7724/setup.c
Simple merge

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

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

diff --cc sound/soc/sh/fsi.c
index 19a2f99,4c2404b..97c5394
--- 1/sound/soc/sh/fsi.c
--- 2/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@ -142,6 -131,10 +142,8 @@@ struct fsi_priv 
  
        struct fsi_stream playback;
        struct fsi_stream capture;
 -
 -      u32 mst_ctrl;
+ 
+       long rate;
  };
  
  struct fsi_core {

diff --cc sound/soc/soc-core.c
index a14a050,b54ea9a..68edc69
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -1046,8 -997,8 +1027,8 @@@ static int soc_suspend(struct device *d
  
        /* close any waiting streams and save state */
        for (i = 0; i < card->num_rtd; i++) {
-               run_delayed_work(&card->rtd[i].delayed_work);
+               flush_delayed_work_sync(&card->rtd[i].delayed_work);
 -              card->rtd[i].codec->suspend_bias_level = card->rtd[i].codec->bias_level;
 +              card->rtd[i].codec->dapm.suspend_bias_level = card->rtd[i].codec->dapm.bias_level;
        }
  
        for (i = 0; i < card->num_rtd; i++) {
@@@ -1921,13 -1668,9 +1902,13 @@@ static int soc_remove(struct platform_d
                /* make sure any delayed work runs */
                for (i = 0; i < card->num_rtd; i++) {
                        struct snd_soc_pcm_runtime *rtd = &card->rtd[i];
-                       run_delayed_work(&rtd->delayed_work);
+                       flush_delayed_work_sync(&rtd->delayed_work);
                }
  
 +              /* remove auxiliary devices */
 +              for (i = 0; i < card->num_aux_devs; i++)
 +                      soc_remove_aux_dev(card, i);
 +
                /* remove and free each DAI */
                for (i = 0; i < card->num_rtd; i++)
                        soc_remove_dai_link(card, i);