Merge branch 'topic/core-change' into for-linus

diff --cc sound/arm/aaci.c
index 6c160a038b239a7c9e2baa0d3f941c68c7d68398,e59372887f3694020d744d68bd2a5cfd7f5a6e1c..1534f3d88bce9b7af634207f7a832ede80fd0225
--- 1/sound/arm/aaci.c
--- 2/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@@ -504,13 -503,9 +503,13 @@@ static int aaci_pcm_hw_params(struct sn
        int err;
  
        aaci_pcm_hw_free(substream);
 +      if (aacirun->pcm_open) {
 +              snd_ac97_pcm_close(aacirun->pcm);
 +              aacirun->pcm_open = 0;
 +      }
  
-       err = devdma_hw_alloc(NULL, substream,
-                             params_buffer_bytes(params));
+       err = snd_pcm_lib_malloc_pages(substream,
+                                      params_buffer_bytes(params));
        if (err < 0)
                goto out;
  

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