git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Mark Brown <broonie@kernel.org>
	Wed, 8 Apr 2015 20:11:26 +0000 (21:11 +0100)
committer	Mark Brown <broonie@kernel.org>
	Wed, 8 Apr 2015 20:11:26 +0000 (21:11 +0100)
commit	2d581a965e9b3af272be1e519b69c0d66948315b
tree	e06051c78b0eadefb7cca2798e14980bfa667606	tree \| snapshot
parent	11c7875c4069721d43717a011e26eae0ac8c813e	commit \| diff
parent	967beb2e87771411e08467152e3d9f1c3ae73a67	commit \| diff
parent	7f2c52afc02554f18db27242b62d4047bbd8df4c	commit \| diff
parent	46172b6c26667133b9945b916b6223cc87bbf10c	commit \| diff

Merge remote-tracking branches 'asoc/topic/jz4740', 'asoc/topic/kirkwood' and 'asoc/topic/link-param' into asoc-next

include/sound/soc-dapm.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/sound/soc.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
sound/soc/kirkwood/kirkwood-i2s.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
sound/soc/soc-core.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
sound/soc/soc-dapm.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history