git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Mark Brown <broonie@linaro.org>
	Mon, 4 Aug 2014 15:31:45 +0000 (16:31 +0100)
committer	Mark Brown <broonie@linaro.org>
	Mon, 4 Aug 2014 15:31:45 +0000 (16:31 +0100)
commit	a6ce305207d2339e174ef49879c217ed7df2d594
tree	4be0f1f21b74c383f60cad06c95f07d9e7aa0b8b	tree \| snapshot (tar.gz zip)
parent	e7177999dc0f70000a6c54f77f2fa96abf9320a2	commit \| diff
parent	d6e08617cb0fd7e5cd9effa6ba51dd00b06a0cf1	commit \| diff
parent	6145dfc6d96a350f50b939d8b5b5301e17f4c2c5	commit \| diff
parent	121eb444135c25701051eb849e7ccf0dd412382b	commit \| diff
parent	a28d167fbbef1f31d79ad3ad65a59ea6fa4d1b1f	commit \| diff

Merge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/kirkwood', 'asoc/topic/max98090' and 'asoc/topic/mc13783' into asoc-next

sound/soc/codecs/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/max98090.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/intel/byt-max98090.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/intel/sst-haswell-dsp.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history