git.kernel.dk Git - linux-block.git/commit

author	Mark Brown <broonie@kernel.org>
	Mon, 6 Oct 2014 11:49:02 +0000 (12:49 +0100)
committer	Mark Brown <broonie@kernel.org>
	Mon, 6 Oct 2014 11:49:02 +0000 (12:49 +0100)
commit	9568eaec6c16f909e806a3920699376ec147d8fa
tree	4fd3de9dc7813e96c6905b04ddfa0d0db443b516	tree \| snapshot
parent	57b027f697c9d7c0356a53fb9e11e9f8d601fb5c	commit \| diff
parent	99632d1077853c2030bec3530011b9d9f423cc89	commit \| diff
parent	3b40a80216e941c518426f7b86705e52acbd413f	commit \| diff
parent	a493b6a637e9d8e828d7ed4be4bdf24dfd1f9250	commit \| diff
parent	a577483b6906b3d7aba9cc07e383682fc9b65318	commit \| diff

Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/rockchip', 'asoc/topic/rsnd' and 'asoc/topic/rt286' into asoc-next

sound/soc/codecs/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/max98090.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/rt286.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/rockchip/rockchip_i2s.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history