Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc...
authorMark Brown <broonie@kernel.org>
Sun, 30 Apr 2017 13:16:26 +0000 (22:16 +0900)
committerMark Brown <broonie@kernel.org>
Sun, 30 Apr 2017 13:16:26 +0000 (22:16 +0900)
commitae17a14f14079d1e23f8b9824d6bafce6af9fa3e
treee98d98095f547ca364ca89319afaa74234505f92
parentfc180c0eafd9c55237b84101853f87746ffc92cd
parentaba611fc4c69896f1355ff0b8ff0ff21c9b5b6fb
parent570c70a60f53ca737ead4e5966c446bf0d39fac9
parentd27f3b4a2d81e873de4d11899e510a1a507da8e3
parentadbdba3fa1b618376363db317324c69d8ce5659c
parent71c314d7ef2442cd798584a3dece8151215e1777
Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/simple', 'asoc/topic/sirf' and 'asoc/topic/ssm4567' into asoc-next
sound/soc/generic/simple-card.c
sound/soc/generic/simple-scu-card.c