Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Fix the cmd cache keys for amp verbs ALSA: add missing definitions(letters) to HD-Audio.txt ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883 [ALSA] intel8x0: add one retry to the ac97_clock measurement routine [ALSA] intel8x0: fix wrong conditions in ac97_clock measure routine ALSA: hda - Avoid call of snd_jack_report at release ALSA: add private_data to struct snd_jack ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes ALSA: snd-usb-caiaq: clean up header includes ALSA: sound/pci: use memdup_user() ALSA: sound/usb: use memdup_user() ALSA: sound/isa: use memdup_user() ALSA: sound/core: use memdup_user() [ALSA] intel8x0: do not use zero value from PICB register [ALSA] intel8x0: an attempt to make ac97_clock measurement more reliable [ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies [ALSA] hda_intel: fix unexpected ring buffer positions ASoC: Disable S3C64xx support in Kconfig ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h
Showing
- Documentation/sound/alsa/HD-Audio.txt 2 additions, 2 deletionsDocumentation/sound/alsa/HD-Audio.txt
- include/sound/jack.h 2 additions, 0 deletionsinclude/sound/jack.h
- include/sound/pcm.h 2 additions, 1 deletioninclude/sound/pcm.h
- sound/core/control.c 13 additions, 22 deletionssound/core/control.c
- sound/core/jack.c 3 additions, 0 deletionssound/core/jack.c
- sound/core/pcm_compat.c 4 additions, 7 deletionssound/core/pcm_compat.c
- sound/core/pcm_lib.c 39 additions, 8 deletionssound/core/pcm_lib.c
- sound/core/pcm_native.c 35 additions, 58 deletionssound/core/pcm_native.c
- sound/core/seq/seq_compat.c 4 additions, 5 deletionssound/core/seq/seq_compat.c
- sound/core/timer.c 4 additions, 7 deletionssound/core/timer.c
- sound/isa/sb/sb16_csp.c 10 additions, 9 deletionssound/isa/sb/sb16_csp.c
- sound/isa/wavefront/wavefront_fx.c 5 additions, 9 deletionssound/isa/wavefront/wavefront_fx.c
- sound/isa/wavefront/wavefront_synth.c 5 additions, 6 deletionssound/isa/wavefront/wavefront_synth.c
- sound/pci/emu10k1/emufx.c 13 additions, 28 deletionssound/pci/emu10k1/emufx.c
- sound/pci/hda/hda_codec.c 5 additions, 1 deletionsound/pci/hda/hda_codec.c
- sound/pci/hda/hda_intel.c 25 additions, 14 deletionssound/pci/hda/hda_intel.c
- sound/pci/hda/patch_conexant.c 18 additions, 3 deletionssound/pci/hda/patch_conexant.c
- sound/pci/hda/patch_realtek.c 2 additions, 3 deletionssound/pci/hda/patch_realtek.c
- sound/pci/hda/patch_sigmatel.c 22 additions, 5 deletionssound/pci/hda/patch_sigmatel.c
- sound/pci/intel8x0.c 70 additions, 21 deletionssound/pci/intel8x0.c
Loading
Please register or sign in to comment