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: (430 commits) ALSA: hda - Add quirk for Acer Ferrari 5000 ALSA: hda - Use cached calls to get widget caps and pin caps ALSA: hda - Don't create empty/single-item input source ALSA: hda - Fix the wrong pin-cap check in patch_realtek.c ALSA: hda - Cache pin-cap values ALSA: hda - Avoid output amp manipulation to digital mic pins ALSA: hda - Add function id to proc output ALSA: pcm - Safer boundary checks ALSA: hda - Detect digital-mic inputs on ALC663 / ALC272 ALSA: sound/ali5451: typo: s/resouces/resources/ ALSA: hda - Don't show the current connection for power widgets ALSA: Fix wrong pointer to dev_err() in arm/pxa2xx-ac97-lib.c ASoC: Declare Headset as Mic and Headphone widgets for SDP3430 ASoC: OMAP: N810: Add more jack functions ASoC: OMAP: N810: Mark not connected input pins ASoC: Add FLL support for WM8400 ALSA: hda - Don't reset stream at each prepare callback ALSA: hda - Don't reset BDL unnecessarily ALSA: pcm - Fix delta calculation at boundary overlap ALSA: pcm - Reset invalid position even without debug option ...
No related branches found
No related tags found
Showing
- Documentation/DocBook/Makefile 2 additions, 1 deletionDocumentation/DocBook/Makefile
- Documentation/DocBook/alsa-driver-api.tmpl 13 additions, 4 deletionsDocumentation/DocBook/alsa-driver-api.tmpl
- Documentation/DocBook/writing-an-alsa-driver.tmpl 29 additions, 23 deletionsDocumentation/DocBook/writing-an-alsa-driver.tmpl
- Documentation/sound/alsa/ALSA-Configuration.txt 61 additions, 26 deletionsDocumentation/sound/alsa/ALSA-Configuration.txt
- Documentation/sound/alsa/HD-Audio-Models.txt 18 additions, 3 deletionsDocumentation/sound/alsa/HD-Audio-Models.txt
- Documentation/sound/alsa/HD-Audio.txt 44 additions, 3 deletionsDocumentation/sound/alsa/HD-Audio.txt
- Documentation/sound/alsa/soc/dapm.txt 3 additions, 0 deletionsDocumentation/sound/alsa/soc/dapm.txt
- Documentation/sound/oss/CS4232 0 additions, 23 deletionsDocumentation/sound/oss/CS4232
- Documentation/sound/oss/Introduction 1 addition, 1 deletionDocumentation/sound/oss/Introduction
- arch/arm/mach-pxa/e740.c 5 additions, 0 deletionsarch/arm/mach-pxa/e740.c
- arch/arm/mach-pxa/e750.c 5 additions, 0 deletionsarch/arm/mach-pxa/e750.c
- arch/arm/mach-pxa/h5000.c 7 additions, 0 deletionsarch/arm/mach-pxa/h5000.c
- arch/arm/mach-pxa/include/mach/eseries-gpio.h 15 additions, 0 deletionsarch/arm/mach-pxa/include/mach/eseries-gpio.h
- arch/arm/mach-pxa/include/mach/regs-ssp.h 6 additions, 1 deletionarch/arm/mach-pxa/include/mach/regs-ssp.h
- arch/arm/mach-pxa/spitz.c 6 additions, 0 deletionsarch/arm/mach-pxa/spitz.c
- arch/arm/mach-s3c2410/dma.c 1 addition, 1 deletionarch/arm/mach-s3c2410/dma.c
- arch/arm/mach-s3c2412/dma.c 2 additions, 2 deletionsarch/arm/mach-s3c2412/dma.c
- arch/arm/mach-s3c2440/dma.c 1 addition, 1 deletionarch/arm/mach-s3c2440/dma.c
- arch/arm/mach-s3c2443/dma.c 1 addition, 1 deletionarch/arm/mach-s3c2443/dma.c
- arch/arm/plat-s3c/include/plat/audio.h 0 additions, 0 deletionsarch/arm/plat-s3c/include/plat/audio.h
Loading
Please register or sign in to comment