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

ASoC: Fixes for v3.12

A few small fixes, nothing with any broad impact but all useful for the
affected systems.  The Kirkwood compatible string change is fixing up a
string just added in the merge window so that we don't get any changes
in released kernels.

diff --cc sound/pci/hda/patch_hdmi.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge