]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broon...
authorMark Brown <broonie@linaro.org>
Mon, 14 Apr 2014 16:42:28 +0000 (17:42 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 14 Apr 2014 16:42:28 +0000 (17:42 +0100)
commit5bb369dcf0f21af957c8ebeb3447406dcbb5b5df
tree26d293e3cd249d2946c6def872fa4bd88ed65669
parent90cfa3f0b8f64c267d79007fb13682f1658161db
parent7cad164239393e3bb3794a7b3c6052b216072937
Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core

Conflicts:
sound/soc/soc-core.c
include/sound/soc.h
sound/soc/soc-core.c
sound/soc/soc-io.c