git.baikalelectronics.ru Git - kernel.git/commit

author	Mark Brown <broonie@kernel.org>
	Sun, 12 Apr 2015 18:49:06 +0000 (19:49 +0100)
committer	Mark Brown <broonie@kernel.org>
	Sun, 12 Apr 2015 18:49:06 +0000 (19:49 +0100)
commit	6591003fdbf528774c5bcac341a1bb30e1db5efd
tree	ef79490129e24ef09d443b5921794140fe167f66	tree \| snapshot
parent	77c403f08316370bae79e454fc80ca5a35f3ed66	commit \| diff
parent	5419d9576fc680e7f6272b05e00315a1868ebac1	commit \| diff
parent	00a62d7104d1014502bb63dc4958f7dfaa1056e4	commit \| diff
parent	b97e1b3f82a4264ff4b782204959a932429bc14a	commit \| diff
parent	10ba59424774ce2082dd1d7e8343f75fb9fd8a95	commit \| diff

Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090', 'asoc/topic/max98925' and 'asoc/topic/nuc900' into asoc-next

include/sound/soc-dapm.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
include/sound/soc.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/soc-core.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/soc-dapm.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history