Conflicts: sound/soc/soc-core.c Axel's fix on two different branches.
Attach a file by drag & drop or click to upload
