Merge branch 'asoc-4.18' into asoc-4.19 for amd dep
authorMark Brown <broonie@kernel.org>
Fri, 22 Jun 2018 14:47:23 +0000 (15:47 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 22 Jun 2018 14:47:23 +0000 (15:47 +0100)
commit44fedd7da485bafcc5eee8794fa54cfc0c047dd4
tree3a6e3dd5f5c3ef4b4bde4026c6b50197d95ddf7d
parent3bec6fa3cdd338860d4b7d4110a49292646d801e
parent1b31de922e28de2bf2078b7a1e341ad4aee6aa03
Merge branch 'asoc-4.18' into asoc-4.19 for amd dep
sound/soc/sh/rcar/core.c
sound/soc/sh/rcar/ssi.c
sound/soc/soc-dapm.c