AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-22 16:51:23 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
a754a87ce8
linux_dsm_epyc7002/sound/soc/omap
History
Arnd Bergmann a754a87ce8 Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards 
The asoc branch that was already merged into v3.4 contains some
board-level changes that conflict with patches we already have
here, so pull in that branch to resolve the conflicts.

Conflicts:
	arch/arm/mach-imx/mach-imx27_visstrim_m10.c
	arch/arm/mach-omap2/board-omap4panda.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: Amended fix for mismerge as reported by Kevin Hilman]
Signed-off-by: Olof Johansson <olof@lixom.net>
2012-03-27 15:18:19 -07:00
..
am3517evm.c ASoC: omap: Add .owner to struct snd_soc_card 2011-12-23 18:13:01 +00:00
ams-delta.c Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards 2012-03-27 15:18:19 -07:00
igep0020.c ASoC: omap: Add .owner to struct snd_soc_card 2011-12-23 18:13:01 +00:00
Kconfig ASoC: Kconfig: OMAP4: Enable support for PandaBoards 2012-01-26 15:40:58 +02:00
Makefile ASoC: OMAP4: Rename the sdp4430 machine driver 2012-01-26 15:38:47 +02:00
n810.c ASoC: Fix build error in sound/soc/omap/n810.c 2012-02-10 11:38:00 +00:00
omap3beagle.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
omap3evm.c ASoC: omap: Add .owner to struct snd_soc_card 2011-12-23 18:13:01 +00:00
omap3pandora.c ASoC: omap: Add .owner to struct snd_soc_card 2011-12-23 18:13:01 +00:00
omap4-hdmi-card.c ASoC: omap: Add .owner to struct snd_soc_card 2011-12-23 18:13:01 +00:00
omap-abe-twl6040.c ASoC: omap-abe-twl6040: Use provided MCLK frequency from pdata 2012-01-26 15:40:53 +02:00
omap-dmic.c ASoC: omap-dmic: Use core to set the msbits constraint 2012-01-20 13:58:31 +00:00
omap-dmic.h ASoC: OMAP4: omap-dmic: Initial support for OMAP DMIC 2011-11-28 17:21:44 +00:00
omap-hdmi.c ASoC: Convert omap directory to module_platform_driver 2011-11-25 13:15:31 +00:00
omap-hdmi.h ASoC: OMAP: Add CPU DAI driver for HDMI 2011-06-03 13:43:45 +01:00
omap-mcbsp.c ASoC: core: Add support for DAI and machine kcontrols. 2012-02-04 12:40:11 +00:00
omap-mcbsp.h ASoC: core: Add support for DAI and machine kcontrols. 2012-02-04 12:40:11 +00:00
omap-mcpdm.c ASoC: omap-mcpdm: Set 24msbits constraint 2012-01-20 13:58:31 +00:00
omap-mcpdm.h ASoC: omap-mcpdm: API to configure offset cancellation 2011-09-26 22:23:32 +01:00
omap-pcm.c ASoC: check for substream not channels_min in pcm engines 2012-01-07 11:18:05 -08:00
omap-pcm.h ASoC: omap: Update e-mail address of Jarkko Nikula 2011-08-12 11:45:10 +09:00
osk5912.c ASoC: omap: Add .owner to struct snd_soc_card 2011-12-23 18:13:01 +00:00
overo.c ASoC: omap: Add .owner to struct snd_soc_card 2011-12-23 18:13:01 +00:00
rx51.c ASoC: core: Add support for DAI and machine kcontrols. 2012-02-04 12:40:11 +00:00
sdp3430.c ASoC: omap: Add .owner to struct snd_soc_card 2011-12-23 18:13:01 +00:00
zoom2.c ASoC: omap: Add .owner to struct snd_soc_card 2011-12-23 18:13:01 +00:00