linux/sound/usb/6fire
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: usb/6fire - Driver for TerraTec DMX 6Fire USB 2011-01-24 18:45:30 +01:00
chip.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
chip.h ALSA: usb/6fire - Driver for TerraTec DMX 6Fire USB 2011-01-24 18:45:30 +01:00
comm.c ALSA: usb/6fire - Driver for TerraTec DMX 6Fire USB 2011-01-24 18:45:30 +01:00
comm.h ALSA: usb/6fire - Driver for TerraTec DMX 6Fire USB 2011-01-24 18:45:30 +01:00
common.h ALSA: usb/6fire - Driver for TerraTec DMX 6Fire USB 2011-01-24 18:45:30 +01:00
control.c ALSA: 6fire - Add support of digital-thru mixer 2011-04-04 12:26:21 +02:00
control.h ALSA: 6fire - Add support of digital-thru mixer 2011-04-04 12:26:21 +02:00
firmware.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
firmware.h ALSA: usb/6fire - Driver for TerraTec DMX 6Fire USB 2011-01-24 18:45:30 +01:00
midi.c ALSA: usb/6fire - Driver for TerraTec DMX 6Fire USB 2011-01-24 18:45:30 +01:00
midi.h ALSA: usb/6fire - Driver for TerraTec DMX 6Fire USB 2011-01-24 18:45:30 +01:00
pcm.c ALSA: 6fire - Fix signedness bug 2011-06-16 21:31:33 +02:00
pcm.h ALSA: usb/6fire - Driver for TerraTec DMX 6Fire USB 2011-01-24 18:45:30 +01:00