Merge remote-tracking branches 'asoc/topic/adsp' and 'asoc/topic/amd' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 13:54:32 +0000 (13:54 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 13:54:32 +0000 (13:54 +0000)
commit188bdf726877fb27530934baea90876dfc2012ba
tree582a51593c3cfcfd0382bb2b654abd08c90ebb3e
parent551e13a4b94301e8a65e29b652935b81d8d32861
parent83a40ce993cda0757b102389e38446e79a2cc172
parent7cb1dc810935fbf82ad06007dc7fb08d93c1e59f
Merge remote-tracking branches 'asoc/topic/adsp' and 'asoc/topic/amd' into asoc-next
sound/soc/Kconfig
sound/soc/Makefile
sound/soc/codecs/wm5110.c