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

author	Mark Brown <broonie@linaro.org>
	Tue, 27 May 2014 19:55:29 +0000 (20:55 +0100)
committer	Mark Brown <broonie@linaro.org>
	Tue, 27 May 2014 19:55:29 +0000 (20:55 +0100)
commit	fd47d5773cae114b6d399d509ced05c14ed39849
tree	8b9489c72b0e3901d1ae0b23bec91d1ebb6ebd0b	tree \| snapshot
parent	30869c2c2656182282f71701620d449862d0388e	commit \| diff
parent	2896b8b4d8f3feaca9c09f7a15e86f8c8b32d7dc	commit \| diff
parent	1f23380b803a670a9eb53f63fd0c662d20ab1b66	commit \| diff
parent	31ee2bfd724ab1fa2fba6472a071bca5e9132139	commit \| diff
parent	f975ca46f634660a52d8c815b465258ae9bce3b7	commit \| diff
parent	2a266f8b2ae790454edb79cb8c707c9305e0307a	commit \| diff
parent	b8a832a0b667d48642c495af17b19443208dd09e	commit \| diff

Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/devm', 'asoc/topic/fsl', 'asoc/topic/fsl-esai', 'asoc/topic/fsl-sai' and 'asoc/topic/fsl-spdif' into asoc-next

include/sound/soc.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
sound/soc/fsl/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
sound/soc/fsl/fsl_esai.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
sound/soc/fsl/fsl_spdif.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
sound/soc/omap/ams-delta.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history