Merge tag 'v4.0-rc7' into asoc-core

Linux 4.0-rc7

diff --cc sound/soc/soc-core.c
index 4443581d69f2859e9fec6c322f8212027fd9295f,e5c990889dcc5e6d9a1ecca2682acf4384ab5ae5..71585d0562fa9c2f8ffd97ecfed1f0ace2055dee
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -1661,9 -1679,8 +1678,10 @@@ static int snd_soc_instantiate_card(str
        card->instantiated = 1;
        snd_soc_dapm_sync(&card->dapm);
        mutex_unlock(&card->mutex);
+       mutex_unlock(&client_mutex);
  
 +      soc_init_card_debugfs(card);
 +
        return 0;
  
  probe_aux_dev_err: