Merge remote-tracking branches 'asoc/topic/multi-codec', 'asoc/topic/mxs-saif', ...
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:12:05 +0000 (13:12 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:12:05 +0000 (13:12 +0000)
commitc9098c6120f7e4dd2d65ce3c3711d4d20380ef7b
treefd63be304d69c9782b1fa5413d27117f0b1012de
parent41967b775e14a123131a842edd46f284e3642816
parent93b0f3eeebdce6f32417187b5d24ea218a3e7fb4
parent8c2727f97b4825adaad43bf98632abc9940345a4
parentd206f66177ab7cd69d79c7e01b43f45d935f43dd
parentbb66f2dc197d9cf1daaa82609302204d71c70389
parent6d3efa40790ad1286cfa032df6d3c9a2748a695e
Merge remote-tracking branches 'asoc/topic/multi-codec', 'asoc/topic/mxs-saif', 'asoc/topic/mxs-sgtl5000', 'asoc/topic/omap' and 'asoc/topic/pxa' into asoc-next
include/sound/soc.h
sound/soc/soc-core.c