2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-14 16:23:51 +08:00
linux-next/sound/arm
Linus Torvalds a429638cac Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
  ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
  ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
  ALSA: usb-audio: add Yamaha MOX6/MOX8 support
  ALSA: virtuoso: add S/PDIF input support for all Xonars
  ALSA: ice1724 - Support for ooAoo SQ210a
  ALSA: ice1724 - Allow card info based on model only
  ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
  ALSA: hdspm - Provide unique driver id based on card serial
  ASoC: Dynamically allocate the rtd device for a non-empty release()
  ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
  ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
  ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
  ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
  ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
  ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
  ALSA: hda/cirrus - support for iMac12,2 model
  ASoC: cx20442: add bias control over a platform provided regulator
  ALSA: usb-audio - Avoid flood of frame-active debug messages
  ALSA: snd-usb-us122l: Delete calls to preempt_disable
  mfd: Put WM8994 into cache only mode when suspending
  ...

Fix up trivial conflicts in:
 - arch/arm/mach-s3c64xx/mach-crag6410.c:
	renamed speyside_wm8962 to tobermory, added littlemill right
	next to it
 - drivers/base/regmap/{regcache.c,regmap.c}:
	duplicate diff that had already come in with other changes in
	the regmap tree
2012-01-12 08:00:30 -08:00
..
aaci.c sound: aaci: Enable module alias autogeneration for AMBA drivers 2011-11-22 10:58:33 +00:00
aaci.h ALSA: AACI: make fifo variables more explanitory 2011-01-26 20:24:52 +00:00
Kconfig ALSA: drop outdated and broken sa11xx-uda1341 driver 2009-03-17 17:58:13 +01:00
Makefile ALSA: Remove old DMA-mmap code from arm/devdma.c 2009-11-27 10:15:24 +01:00
pxa2xx-ac97-lib.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
pxa2xx-ac97.c ALSA: convert sound/* to use module_platform_driver() 2011-11-27 18:43:48 +01:00
pxa2xx-pcm-lib.c ASoC: PXA: Fix oops in __pxa2xx_pcm_prepare 2011-04-03 18:48:56 +09:00
pxa2xx-pcm.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
pxa2xx-pcm.h [ARM] pxa: explicit #include <mach/dma.h> in various drivers 2008-12-02 14:42:26 +08:00