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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 76987bf 5a0cf02 574d31d d5eb436 157b68b a73be94)

author	Mark Brown <broonie@kernel.org>
	Fri, 12 Jan 2018 12:29:30 +0000 (12:29 +0000)
committer	Mark Brown <broonie@kernel.org>
	Fri, 12 Jan 2018 12:29:30 +0000 (12:29 +0000)
commit	ced9541ce740dd9e4946bbcf55a304b6394515fb
tree	b5cadcb4817d1d67533c45e28a3c6e329183f48a	tree
parent	76987bfb0dbe5a3c54904c02a8ded85a5f337643	commit \| diff
parent	5a0cf02465a0510c48ab34e7ba88b0f8c20b9ea1	commit \| diff
parent	574d31d013d977be1cfe909da6c227c950856822	commit \| diff
parent	d5eb436acc8104b5c789359aa8c923ff5fafcd62	commit \| diff
parent	157b68babe3281222e08c9c58456ca22544f06bc	commit \| diff
parent	a73be94364b80388c0a600715117923669f165f8	commit \| diff

Merge remote-tracking branches 'asoc/topic/sunxi', 'asoc/topic/symmetry', 'asoc/topic/tas5720', 'asoc/topic/tas6424' and 'asoc/topic/tfa9879' into asoc-next

MAINTAINERS	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
include/sound/soc-dai.h	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
sound/soc/sunxi/sun4i-i2s.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history

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