Merge tag 'asoc-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...
authorTakashi Iwai <tiwai@suse.de>
Fri, 6 Mar 2015 13:25:27 +0000 (14:25 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 6 Mar 2015 13:25:27 +0000 (14:25 +0100)
commita52afea68f94d2501b7fe1fa18cc6acf84e35a76
tree977eb066b9de1bea4e7ce7ea9a5583d00279061f
parent8b28c93fe5a55873ce22b7126e84eb59290f8603
parentd7e3281b52fea8917fb4a7a5b09df5e6a9d2850c
Merge tag 'asoc-v4.1' of git://git./linux/kernel/git/broonie/sound into for-next

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.
include/sound/soc.h
sound/core/pcm_native.c
sound/pci/hda/hda_controller.c
sound/pci/hda/hda_intel.c