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: (252 commits) ASoC: Check progress when reporting periods from i.MX FIQ handler ASoC: Remove a unused variables from i.MX FIQ runtime data ALSA: hda - Add/fix ALC269 FSC and Quanta models ALSA: hda - Add ALC670 codec support OMAP4: PMIC: Add support for twl6030 codec ALSA: hda - remove unnecessary msleep on power state transitions usb/gadget/{f_audio,gmidi}.c: follow recent changes in audio.h ASoC: fsi: Modify over/under run error settlement ASoC: OMAP4: Add McPDM platform driver ASoC: OMAP4: Add support for McPDM ASoC: OMAP: data_type and sync_mode configurable in audio dma ALSA: hda - Add missing description in HD-Audio-Models.txt ALSA: add support for Macbook Air 2,1 internal speaker ALSA: usbaudio: consolidate header files ALSA: usbmixer: bail out early when parsing audio class v2 descriptors ALSA: usbaudio: implement basic set of class v2.0 parser ALSA: usbaudio: introduce new types for audio class v2 ALSA: usbaudio: parse USB descriptors with structs ALSA: hda - enable snoop for Intel Cougar Point ALSA: hda - Remove identical definitions for macmini3 model ...
Showing
- Documentation/sound/alsa/ALSA-Configuration.txt 26 additions, 1 deletionDocumentation/sound/alsa/ALSA-Configuration.txt
- Documentation/sound/alsa/HD-Audio-Models.txt 5 additions, 0 deletionsDocumentation/sound/alsa/HD-Audio-Models.txt
- Documentation/sound/alsa/HD-Audio.txt 27 additions, 0 deletionsDocumentation/sound/alsa/HD-Audio.txt
- arch/arm/plat-mxc/Makefile 4 additions, 0 deletionsarch/arm/plat-mxc/Makefile
- arch/arm/plat-mxc/ssi-fiq-ksym.c 20 additions, 0 deletionsarch/arm/plat-mxc/ssi-fiq-ksym.c
- arch/arm/plat-mxc/ssi-fiq.S 134 additions, 0 deletionsarch/arm/plat-mxc/ssi-fiq.S
- arch/sh/include/asm/siu.h 26 additions, 0 deletionsarch/sh/include/asm/siu.h
- drivers/mfd/twl-core.c 15 additions, 3 deletionsdrivers/mfd/twl-core.c
- drivers/usb/gadget/f_audio.c 3 additions, 3 deletionsdrivers/usb/gadget/f_audio.c
- drivers/usb/gadget/gmidi.c 1 addition, 1 deletiondrivers/usb/gadget/gmidi.c
- include/linux/i2c/twl.h 4 additions, 0 deletionsinclude/linux/i2c/twl.h
- include/linux/usb/audio.h 114 additions, 6 deletionsinclude/linux/usb/audio.h
- include/sound/core.h 3 additions, 0 deletionsinclude/sound/core.h
- include/sound/cs46xx_dsp_spos.h 4 additions, 2 deletionsinclude/sound/cs46xx_dsp_spos.h
- include/sound/pcm.h 53 additions, 1 deletioninclude/sound/pcm.h
- include/sound/pcm_oss.h 1 addition, 1 deletioninclude/sound/pcm_oss.h
- include/sound/sb.h 1 addition, 0 deletionsinclude/sound/sb.h
- include/sound/soc-dai.h 2 additions, 0 deletionsinclude/sound/soc-dai.h
- include/sound/soc-dapm.h 32 additions, 0 deletionsinclude/sound/soc-dapm.h
- include/sound/soc.h 26 additions, 0 deletionsinclude/sound/soc.h
Loading
Please register or sign in to comment