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)
commita4b12990b68079290ab62799035afe175b4bdc23
treeace02d498d6c7d98178ae4d6a15b0e53dfdbee93
parent84f6965e2b49be82bda0cc794c9a01b8b500cb37
parentc3518d1bd45ebfdfd88480e5781054fed378fb22
parent89c6785715592a6b082b3f9f28c27bb14b041c7d
parent7cb5e1bb9f91bf984f26b520072a22610235d869
parenta9576cbbbafa2c687121638dadebfb136562a522
parentba9c949f797aa3af56303445812a452144c61c35
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