Merge branch 'topic/multicodec' of...

Merge branch 'topic/multicodec' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-component

Merge branch 'topic/multicodec' of...
Merge branch 'topic/multicodec' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-component
9f68730d · Mark Brown · 111c0cf5 · 02c9c7b9 · 9f68730d
Commit 9f68730d authored Apr 22, 2014 by Mark Brown
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 154 additions and 92 deletions

sound/soc/soc-core.c sound/soc/soc-core.c +154 -92

No files found.
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c