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: (290 commits) ALSA: pcm - Update document about xrun_debug proc file ALSA: lx6464es - support standard alsa module parameters ALSA: snd_usb_caiaq: set mixername ALSA: hda - add quirk for STAC92xx (SigmaTel STAC9205) ALSA: use card device as parent for jack input-devices ALSA: sound/ps3: Correct existing and add missing annotations ALSA: sound/ps3: Restructure driver source ALSA: sound/ps3: Fix checkpatch issues ASoC: Fix lm4857 control ALSA: ctxfi - Clear PCM resources at hw_params and hw_free ALSA: ctxfi - Check the presence of SRC instance in PCM pointer callbacks ALSA: ctxfi - Add missing start check in atc_pcm_playback_start() ALSA: ctxfi - Add use_system_timer module option ALSA: usb - Add boot quirk for C-Media 6206 USB Audio ALSA: ctxfi - Fix wrong model id for UAA ALSA: ctxfi - Clean up probe routines ALSA: hda - Fix the previous tagra-8ch patch ALSA: hda - Add 7.1 support for MSI GX620 ALSA: pcm - A helper function to compose PCM stream name for debug prints ALSA: emu10k1 - Fix minimum periods for efx playback ...
Showing
- Documentation/sound/alsa/ALSA-Configuration.txt 33 additions, 3 deletionsDocumentation/sound/alsa/ALSA-Configuration.txt
- Documentation/sound/alsa/HD-Audio-Models.txt 15 additions, 3 deletionsDocumentation/sound/alsa/HD-Audio-Models.txt
- Documentation/sound/alsa/Procfile.txt 22 additions, 14 deletionsDocumentation/sound/alsa/Procfile.txt
- Documentation/sound/alsa/README.maya44 163 additions, 0 deletionsDocumentation/sound/alsa/README.maya44
- Documentation/sound/alsa/soc/dapm.txt 1 addition, 0 deletionsDocumentation/sound/alsa/soc/dapm.txt
- MAINTAINERS 4 additions, 2 deletionsMAINTAINERS
- arch/powerpc/include/asm/mpc52xx_psc.h 11 additions, 0 deletionsarch/powerpc/include/asm/mpc52xx_psc.h
- include/linux/pci_ids.h 12 additions, 0 deletionsinclude/linux/pci_ids.h
- include/sound/asound.h 1 addition, 0 deletionsinclude/sound/asound.h
- include/sound/core.h 1 addition, 10 deletionsinclude/sound/core.h
- include/sound/driver.h 0 additions, 1 deletioninclude/sound/driver.h
- include/sound/pcm.h 2 additions, 74 deletionsinclude/sound/pcm.h
- include/sound/soc-dai.h 7 additions, 23 deletionsinclude/sound/soc-dai.h
- include/sound/soc-dapm.h 21 additions, 3 deletionsinclude/sound/soc-dapm.h
- include/sound/soc.h 30 additions, 4 deletionsinclude/sound/soc.h
- include/sound/wm9081.h 25 additions, 0 deletionsinclude/sound/wm9081.h
- sound/aoa/fabrics/layout.c 4 additions, 4 deletionssound/aoa/fabrics/layout.c
- sound/aoa/soundbus/i2sbus/core.c 4 additions, 4 deletionssound/aoa/soundbus/i2sbus/core.c
- sound/core/Kconfig 2 additions, 0 deletionssound/core/Kconfig
- sound/core/init.c 39 additions, 22 deletionssound/core/init.c
Loading
Please register or sign in to comment