Merge remote-tracking branches 'asoc/topic/mediatek', 'asoc/topic/mtk', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:55:21 +0000 (15:55 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:55:21 +0000 (15:55 +0100)
commitacb47ad5023fbd29a2c9a681c28b33968c9dcc9e
tree37fa530c463243d9e0d8316e3ed68bbfa04a8e09
parent1d1ed2c23e6fac1c9a11df846536553754ac9780
parent775b07de4fa470ac10cd74f1b1a8d441b4f5838d
parent0643558f85e740019e0632072c55e8b2f79a8d7d
parentd5f1117ff60d1e314b15e3a85b7705db3421d7d4
parent5e3cdaa20816dd2fe4dc17d06a9f0dae0abc930c
parent7d40acc38be55abb095f517e4e3a634818bc5253
Merge remote-tracking branches 'asoc/topic/mediatek', 'asoc/topic/mtk', 'asoc/topic/nuc900', 'asoc/topic/of-name' and 'asoc/topic/omap' into asoc-next
include/sound/soc.h
sound/soc/mediatek/mt8173-max98090.c
sound/soc/mediatek/mt8173-rt5650-rt5676.c
sound/soc/mediatek/mtk-afe-pcm.c
sound/soc/soc-core.c