projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b28c93 d7e3281)
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)
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.

1  2 
include/sound/soc.h patch | diff1 | diff2 | blob | history
sound/core/pcm_native.c patch | diff1 | diff2 | blob | history
sound/pci/hda/hda_controller.c patch | diff1 | diff2 | blob | history
sound/pci/hda/hda_intel.c patch | diff1 | diff2 | blob | history

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
Domain: System / Kernel;