linux/sound/usb/usx2y
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
..
Makefile ALSA: Add USB US122L driver 2008-08-01 13:37:12 +02:00
us122l.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 2012-01-12 08:00:30 -08:00
us122l.h ALSA: snd-usb-us122l: add product IDs of US-122MKII and US-144MKII 2009-12-08 12:56:50 +01:00
usX2Yhwdep.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
usX2Yhwdep.h [ALSA] Remove xxx_t typedefs: USB-USX2Y 2006-01-03 12:19:56 +01:00
usb_stream.c ALSA: snd-usb-us122l: Delete calls to preempt_disable 2012-01-09 11:31:30 +01:00
usb_stream.h ALSA: Add USB US122L driver 2008-08-01 13:37:12 +02:00
usbus428ctldefs.h [ALSA] Remove xxx_t typedefs: USB-USX2Y 2006-01-03 12:19:56 +01:00
usbusx2y.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 2012-01-12 08:00:30 -08:00
usbusx2y.h ALSA: usb-audio: refactor code 2010-03-05 08:17:14 +01:00
usbusx2yaudio.c sound: add moduleparam.h to users of module_param/MODULE_PARM_DESC 2011-10-31 19:31:20 -04:00
usx2y.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
usx2yhwdeppcm.c Fix common misspellings 2011-03-31 11:26:23 -03:00
usx2yhwdeppcm.h ALSA: sound/usb/usx2y: fix sparse warning: Should it be static? 2009-02-26 09:57:17 +01:00