]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branches 'asoc/topic/ml26124', 'asoc/topic/of', 'asoc/topic...
authorMark Brown <broonie@linaro.org>
Wed, 12 Mar 2014 23:04:35 +0000 (23:04 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 12 Mar 2014 23:04:35 +0000 (23:04 +0000)
commitb91c8f2cfca3ab348c48b12f472d5017c567ec2a
treeace02d498d6c7d98178ae4d6a15b0e53dfdbee93
parent4109b70d840ec0b987be5714e67213cc5dcca0b0
parentb45d0e4bc9d3c0744e44814b52f0287d56f6cbd6
parentef0e0fa432f131eb79a56848ff858ad5125d703e
parent2db88c00063d490c934b7c38e402d2574edabe03
parent12d66cdcf3d23f7697a333fe3ccef1786590f20c
parent39e3c68d80dc726adae255b1c0dc087caabb4f42
Merge remote-tracking branches 'asoc/topic/ml26124', 'asoc/topic/of', 'asoc/topic/omap', 'asoc/topic/pxa' and 'asoc/topic/rcar' into asoc-next
33 files changed:
include/sound/soc-dai.h
include/sound/soc.h
include/trace/events/hswadsp.h
include/trace/events/intel-sst.h
sound/soc/intel/Kconfig
sound/soc/intel/Makefile
sound/soc/intel/byt-rt5640.c
sound/soc/intel/haswell.c
sound/soc/intel/sst-acpi.c
sound/soc/intel/sst-baytrail-dsp.c
sound/soc/intel/sst-baytrail-ipc.c
sound/soc/intel/sst-baytrail-ipc.h
sound/soc/intel/sst-baytrail-pcm.c
sound/soc/intel/sst-dsp-priv.h
sound/soc/intel/sst-dsp.c
sound/soc/intel/sst-dsp.h
sound/soc/intel/sst-firmware.c
sound/soc/intel/sst-haswell-dsp.c
sound/soc/intel/sst-haswell-ipc.c
sound/soc/intel/sst-haswell-ipc.h
sound/soc/intel/sst-haswell-pcm.c
sound/soc/intel/sst-mfld-dsp.h
sound/soc/intel/sst-mfld-platform.c
sound/soc/intel/sst-mfld-platform.h
sound/soc/intel/sst_dsp.h
sound/soc/intel/sst_platform.c
sound/soc/intel/sst_platform.h
sound/soc/omap/ams-delta.c
sound/soc/pxa/corgi.c
sound/soc/pxa/magician.c
sound/soc/pxa/spitz.c
sound/soc/pxa/tosa.c
sound/soc/soc-core.c