android_kernel_xiaomi_sm8350/sound/soc
Linus Torvalds 7cc4e87f91 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.
2008-10-11 10:09:45 -07:00
..
at32 ALSA: sound/soc/at32: Useless NULL test 2008-10-10 13:41:40 +02:00
at91 ALSA: ASoC: Convert wm8731 to a new-style i2c driver 2008-09-04 10:34:25 +02:00
au1x ALSA: Au1xpsc: psc not disabled when TX is idle 2008-07-15 15:08:28 +02:00
blackfin sound: ASoC: Blackfin: add Blackfin arch ASoC Kconfig and Makefile 2008-09-09 09:11:25 +02:00
codecs ALSA: ASoC: Correct inverted Mic PGA Switch control in wm8510 driver 2008-10-10 13:41:52 +02:00
davinci ALSA: Correct Vladimir Barinov's e-mail address 2008-10-10 13:41:45 +02:00
fsl ALSA: ASoC - fix DMA channel selection in Freescale MPC8610 sound drivers 2008-08-13 11:46:22 +02:00
omap ALSA: ASoC: Convert tlv320aic3x to a new-style i2c driver (v2) 2008-09-23 08:18:26 +02:00
pxa Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2008-10-11 10:09:45 -07:00
s3c24xx ALSA: ASoC: Check for machine type in GTA01 machine driver 2008-10-10 13:41:58 +02:00
sh ALSA: asoc: sh - merge structs snd_soc_codec_dai and snd_soc_cpu_dai. 2008-07-10 09:32:46 +02:00
Kconfig sound: ASoC: Fix dependency on AC97_BUS 2008-09-23 08:18:16 +02:00
Makefile sound: ASoC: Blackfin: Include Blackfin architecture support in build 2008-09-09 09:11:28 +02:00
soc-core.c ALSA: ASoC: Use codec digital mute when stopping playback 2008-09-09 09:11:59 +02:00
soc-dapm.c ALSA: ASoC: add new param mux to dapm_mux_update_power 2008-10-10 13:41:54 +02:00