git.agner.ch Git - linux-drm-fsl-dcu.git/commit

author	Mark Brown <broonie@kernel.org>
	Sun, 12 Apr 2015 18:49:06 +0000 (19:49 +0100)
committer	Mark Brown <broonie@kernel.org>
	Sun, 12 Apr 2015 18:49:06 +0000 (19:49 +0100)
commit	e1f059937a2b90a1dbf314959776d3f51b4ab20d
tree	ef79490129e24ef09d443b5921794140fe167f66	tree \| snapshot
parent	626761ad022c01450330c5774399b35d7fc7a0ac	commit \| diff
parent	46172b6c26667133b9945b916b6223cc87bbf10c	commit \| diff
parent	c6b424fee7511407107403d3a7c50e0756ae282e	commit \| diff
parent	5116ede10dc92d7a11a38fc59f545c24a33809cd	commit \| diff
parent	fa41181fe37530d78acb25b4e2c9c019241cbbf6	commit \| diff

Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090', 'asoc/topic/max98925' and 'asoc/topic/nuc900' into asoc-next

include/sound/soc-dapm.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
include/sound/soc.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/soc-core.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/soc-dapm.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history