Merge remote-tracking branches 'asoc/topic/gpio' and 'asoc/topic/intel' into asoc...

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/intel/byt-rt5640.c
index 5535c3fb7922ab2a3075588664cf27970d0f2a14,eff97c8e52184ac25ad1cea57a3a7b2f57327730,ac52c77721b16931aff5892a93120eef5924533f..53d160d399723aaf1537bd8987e51b92758dae74
--- 1/sound/soc/intel/byt-rt5640.c
--- 2/sound/soc/intel/byt-rt5640.c
--- 3/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@@@ -167,8 -176,7 -151,7 +145,7 @@@@ static struct platform_driver byt_rt564
        .driver = {
                .name = "byt-rt5640",
                .owner = THIS_MODULE,
-               .pm = BYT_RT5640_PM_OPS,
++              .pm = &snd_soc_pm_ops,
        },
   };
   module_platform_driver(byt_rt5640_audio)

diff --cc sound/soc/intel/haswell.c
Simple merge

diff --cc sound/soc/intel/sst-haswell-pcm.c
Simple merge