WSL2-Linux-Kernel/sound/soc
Linus Torvalds 7abec10c62 Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc
* 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc: (79 commits)
  ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung
  ARM: SAMSUNG: Cleanup resources by using macro
  ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h
  ARM: S5P: To merge devs.c files to one devs.c
  ARM: S3C64XX: To merge devs.c files to one devs.c
  ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c
  ARM: S5P64X0: Add Power Management support
  ARM: S5P: Make the sleep code common for S5P series SoCs
  ARM: S5P: Make the common S5P PM code conditionally compile
  ARM: SAMSUNG: Move S5P header files to plat-samsung
  ARM: SAMSUNG: Move S3C24XX header files to plat-samsung
  ARM: SAMSUNG: Moving each SoC support header files
  ARM: SAMSUNG: Consolidate plat/pll.h
  ARM: SAMSUNG: Consolidate plat/pwm-clock.h
  ARM: SAMSUNG: Cleanup mach/clkdev.h
  ARM: SAMSUNG: remove sdhci default configuration setup platform helper
  ARM: EXYNOS4: Add FIMC device on SMDKV310 board
  ARM: EXYNOS4: Add header file protection macros
  ARM: EXYNOS4: Add usb ehci device to the SMDKV310
  ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
  ...

Fix up conflicts in
 - arch/arm/mach-exynos4/{Kconfig,clock.c}
	ARM_CPU_SUSPEND, various random device tables (gah!)
 - drivers/gpio/Makefile
	sa1100 gpio added, samsung gpio drivers merged
2011-11-05 18:18:05 -07:00
..
atmel ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-08 14:10:54 +01:00
au1x Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2011-11-03 13:28:14 -07:00
blackfin ASoC: Staticise bf5xx_pcm_i2s_new() 2011-09-21 14:55:50 +01:00
codecs Merge branch 'fix/asoc' into for-linus 2011-11-03 18:20:53 +01:00
davinci Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 2011-10-28 14:25:01 -07:00
ep93xx ASoC: Staticise ep93xx_ac97_dai 2011-10-03 14:15:32 +01:00
fsl ASoC: fsl: Fix error handling if platform_device_add fails 2011-09-20 12:58:59 +01:00
imx ASoC: Fix typo in Kconfig symbol for tlv320aic32x4 2011-10-11 14:32:22 +01:00
jz4740 ASoC: Staticise jz4740_pcm_new() 2011-09-21 14:55:50 +01:00
kirkwood ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-08 14:10:54 +01:00
mid-x86 ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-08 14:10:54 +01:00
mxs ASoC: keep pointer to resource so it can be freed 2011-10-22 10:46:35 +01:00
nuc900 Merge branch 'topic/asoc' into for-linus 2011-10-27 10:43:40 +02:00
omap ASoC: sdp3430: Let core to deal with the DAPM widgets 2011-10-10 16:18:12 +01:00
pxa ASoC: pxa: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-13 11:50:04 +01:00
s6000 ASoC: s6000-pcm: remove unused variable 'dai' 2011-08-15 22:51:48 +09:00
samsung Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07:00
sh Merge branch 'topic/asoc' into for-linus 2011-10-27 10:43:40 +02:00
tegra ASoC: Tegra: sparse cleanup 2011-10-17 22:43:16 +01:00
txx9 Merge branch 'topic/asoc' into for-linus 2011-10-27 10:43:40 +02:00
Kconfig Merge branch 'regmap-asoc' into for-3.2 2011-08-08 15:00:13 +09:00
Makefile ASoC: mxs: add asoc configuration files 2011-07-28 11:47:41 +01:00
soc-cache.c Merge branch 'for-3.1' into for-3.2 2011-08-31 09:46:42 +01:00
soc-core.c Merge branch 'topic/remove-irqf_disable' into for-linus 2011-10-26 23:51:48 +02:00
soc-dapm.c ASoC: Fix DAPM sync for TLV320AIC3x custom DAPM widget 2011-10-10 10:28:26 +01:00
soc-io.c ASoC: Squash error codes from regmap down to -1 on read 2011-10-09 14:35:59 +01:00
soc-jack.c ASoC: Ensure DAPM widgets are set up before we sync jacks 2011-10-06 16:18:39 +01:00
soc-pcm.c ASoC: core: Add flag to ignore pmdown_time at pcm_close 2011-10-14 20:42:21 +01:00
soc-utils.c ASoC: Work around allmodconfig failure 2011-04-28 12:09:06 +01:00