AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-30 13:36:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
e4862f2f6f
linux_dsm_epyc7002/sound/soc
History
Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c
2010-08-16 18:42:58 +01:00
..
atmel ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
au1x ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
blackfin Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.37 2010-08-15 14:56:40 +01:00
codecs Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
davinci ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
ep93xx ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
fsl Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
imx Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
jz4740 ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
kirkwood ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
nuc900 ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
omap ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
pxa ASoC: update setting for pxa ssp slave mode 2010-08-15 14:50:59 +01:00
s3c24xx ASoC: Automatically calculate clock ratio for WM8580 2010-08-15 14:52:12 +01:00
s6000 ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
sh ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
txx9 ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
Kconfig ASoC: Fix sorting of Makefile and Kconfig 2010-07-05 23:35:29 +09:00
Makefile ASoC: Fix sorting of Makefile and Kconfig 2010-07-05 23:35:29 +09:00
soc-cache.c Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.37 2010-08-15 14:56:40 +01:00
soc-core.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
soc-dapm.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
soc-jack.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
soc-utils.c ASoC: Add BCLK calculation utility for TDM mode too 2009-11-25 19:55:46 +00:00