Merge tag 'asoc-v3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

ASoC: Updates for v3.10

A few more bug fixes, the DAPM clock fix is actually a driver specific
one since currently there's only one user of the clock support due to
the problems relying on the clock API.

diff --cc sound/soc/codecs/wm8994.c
Simple merge

diff --cc sound/soc/davinci/davinci-mcasp.c
Simple merge

diff --cc sound/soc/soc-dapm.c
Simple merge