git.samba.org - sfrench/cifs-2.6.git/commit - sound/oss/ad1848.c

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6ce6d18 af0f6c5 ba6c295 3bb0f7c 93a00c4 c001bf6)

author	Mark Brown <broonie@kernel.org>
	Fri, 5 Jan 2018 12:44:13 +0000 (12:44 +0000)
committer	Mark Brown <broonie@kernel.org>
	Fri, 5 Jan 2018 12:44:13 +0000 (12:44 +0000)
commit	04df320d46da61e72057ca6f3db0432b28d5d5b1
tree	18a103d086a9637fea9b49402de07076356667a9	tree
parent	6ce6d181f99adcea5e03a838f493aa16087ab190	commit \| diff
parent	af0f6c5820845b66c76296f281da5cf916d7e094	commit \| diff
parent	ba6c29592545635f7c476cbef0db0c4f39495f23	commit \| diff
parent	3bb0f7c31b1aedd0f85c675297031281799145d7	commit \| diff
parent	93a00c467fe998bf5716cbc9cabc127046054782	commit \| diff
parent	c001bf633a910cfc8a5b84b80634db4636bf1724	commit \| diff

Merge remote-tracking branches 'asoc/topic/ts3a227e', 'asoc/topic/tsc42xx', 'asoc/topic/twl4030', 'asoc/topic/twl6040' and 'asoc/topic/uda1380' into asoc-next

MAINTAINERS	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.