Merge tag 'asoc-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

ASoC: Changes for v4.1

A selection of changes for v4.1 so far.  The main things are:

 - Move of jack registration to the card where it belongs.
 - Support for DAPM routes specified by both the machine driver and DT.

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/core/pcm_native.c
Simple merge

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

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