Merge branch 'topic/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc sound/soc/pxa/corgi.c
Simple merge

diff --cc sound/soc/pxa/magician.c
Simple merge

diff --cc sound/soc/pxa/spitz.c
Simple merge

diff --cc sound/soc/pxa/tosa.c
Simple merge