linux/sound/oss
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
..
dmasound
.gitignore
ad1848.c ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
ad1848.h
ad1848_mixer.h
aedsp16.c
audio.c
bin2hex.c
CHANGELOG
coproc.h
dev_table.c
dev_table.h
dmabuf.c
hex2hex.c
kahlua.c
Kconfig sound: Kconfig: drop unknown symbol ARCH_CLPS7500 2011-11-22 23:28:23 +01:00
Makefile
midi_ctrl.h
midi_synth.c
midi_synth.h
midibuf.c
mpu401.c
mpu401.h
msnd.c
msnd.h
msnd_classic.c
msnd_classic.h
msnd_pinnacle.c ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
msnd_pinnacle.h
opl3.c
opl3_hw.h
os.h
pas2.h
pas2_card.c ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
pas2_midi.c
pas2_mixer.c
pas2_pcm.c
pss.c ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
README.FIRST
sb.h
sb_audio.c
sb_card.c
sb_card.h
sb_common.c
sb_ess.c
sb_ess.h
sb_midi.c
sb_mixer.c
sb_mixer.h
sequencer.c
sound_calls.h
sound_config.h
sound_firmware.h
sound_timer.c sound: oss: use strlcpy() in sound_timer_init() 2011-09-29 08:12:33 +02:00
soundcard.c
soundvers.h
swarm_cs4297a.c
sys_timer.c
trix.c ALSA: module_param: make bool parameters really bool 2011-12-19 10:34:41 +01:00
tuning.h
uart401.c
uart6850.c
ulaw.h
v_midi.c
v_midi.h
vidc.c
vidc.h
vidc_fill.S
vwsnd.c
waveartist.c
waveartist.h

The modular sound driver patches were funded by Red Hat Software 
(www.redhat.com). The sound driver here is thus a modified version of 
Hannu's code. Please bear that in mind when considering the appropriate
forums for bug reporting. 

Alan Cox