WSL2-Linux-Kernel/sound/soc/samsung
Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 01:07:21 -07:00
..
Kconfig ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX 2012-03-03 07:44:51 +09:00
Makefile ASoC: Rename Speyside WM8962 to Tobermory 2011-11-30 20:49:05 +00:00
ac97.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
dma.c ASoC: samsung dma - Don't indicate support for pause/resume. 2012-09-06 18:55:59 +08:00
dma.h ASoC: Samsung: Update DMA interface 2011-09-14 11:10:04 +05:30
goni_wm8994.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
h1940_uda1380.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
i2s-regs.h ASoC: SAMSUNG: Add idma related register definition 2011-06-26 12:05:23 +01:00
i2s.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
i2s.h ASoC: Samsung: Update email id of the author 2012-02-29 23:37:57 +00:00
idma.c ASoC: Fix idma build after update for channel count check 2012-01-08 23:04:28 -08:00
idma.h ASoC: Fix __iomem annotation for IDMA registers 2011-11-29 17:28:16 +00:00
jive_wm8750.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
littlemill.c ASoC: littlemill: Add userspace control of the WM1250 I/O 2012-07-18 22:09:23 +01:00
ln2440sbc_alc650.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
lowland.c ASoC: lowland: Support digital link for WM9081 2012-05-08 12:29:17 +01:00
neo1973_wm8753.c Merge branch 'topic/asoc' into for-linus 2012-03-18 18:22:37 +01:00
pcm.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
pcm.h ASoC: SAMSUNG: Move PCM specific definitions into pcm.c 2011-01-10 11:38:22 +00:00
regs-i2s-v2.h
rx1950_uda1380.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
s3c-i2s-v2.c ASoC: samsung: s3c-i2s-v2.c needs module.h 2011-10-03 21:34:12 +01:00
s3c-i2s-v2.h
s3c24xx-i2s.c ASoC: Convert S3C24XX I2S driver to gpiolib API 2012-07-15 22:21:42 +01:00
s3c24xx-i2s.h
s3c24xx_simtec.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
s3c24xx_simtec.h
s3c24xx_simtec_hermes.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
s3c24xx_simtec_tlv320aic23.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
s3c24xx_uda134x.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
s3c2412-i2s.c ASoC: Convert S3C2412 I2S driver to gpiolib API 2012-07-15 22:21:42 +01:00
s3c2412-i2s.h
smartq_wm8987.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
smdk2443_wm9710.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
smdk_spdif.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
smdk_wm8580.c ASoC: Samsung: Update email id of the author 2012-02-29 23:37:57 +00:00
smdk_wm8580pcm.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
smdk_wm8994.c ASoC: smdk_wm8994: Convert to use snd_soc_register_card() 2012-07-03 19:48:29 +01:00
smdk_wm8994pcm.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
smdk_wm9713.c ASoC: Samsung: Update email id of the author 2012-02-29 23:37:57 +00:00
spdif.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
spdif.h
speyside.c ASoC: Use dai_fmt in Speyside 2012-04-16 20:00:00 +01:00
tobermory.c ASoC: samsung: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00