linux/sound/usb/caiaq
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: snd-usb-caiaq: rename files to remove redundant information in file pathes 2009-04-14 13:31:17 +02:00
audio.c ALSA: snd_usb_caiaq: track submitted output urbs 2011-08-14 18:10:43 +02:00
audio.h ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes 2009-04-14 13:31:17 +02:00
control.c ALSA: snd-usb-caiaq: Add support for Traktor Kontrol S4 2010-09-10 11:08:39 +02:00
control.h ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes 2009-04-14 13:31:17 +02:00
device.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
device.h ALSA: snd-usb-caiaq: Add support for Maschine 2011-10-13 08:16:46 +02:00
input.c ALSA: snd-usb-caiaq: Add support for Maschine 2011-10-13 08:16:46 +02:00
input.h ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes 2009-04-14 13:31:17 +02:00
midi.c ALSA: caiaq - Fix possible string-buffer overflow 2011-02-14 22:50:46 +01:00
midi.h ALSA: sound/usb/caiaq/midi.h: Checkpatch cleanup 2010-03-02 11:22:49 +01:00