summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-12-20 15:43:15 +0000
committerMark Brown <broonie@kernel.org>2017-12-20 15:43:15 +0000
commit8dc7e208c759b384e09a0ecf68e45e69621317ef (patch)
treef8c7d5583357ece40db8b1e0fb26500e18933ebe /sound/soc
parent38acd9b8acf90f0cce094e1f5465522a96a66c67 (diff)
parent958d022e326810fd762505bd02007aced79ffcbc (diff)
parent737e0b7b67bdfe24090fab2852044bb283282fc5 (diff)
parent15f8c5f2415bfac73f33a14bcd83422bcbfb5298 (diff)
Merge remote-tracking branches 'asoc/fix/rt5663', 'asoc/fix/tlv320aic31xx' and 'asoc/fix/twl4030' into asoc-linus