Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (148 commits) [ALSA] intel8x0m - Free irq in suspend [ALSA] Move CONFIG_SND_AC97_POWER_SAVE to pci/Kconfig [ALSA] usb-audio: add mixer control names for the Aureon 5.1 MkII [ALSA] ES1938: remove duplicate field initialization [ALSA] usb-audio: increase number of packets per URB [ALSA] hda-codec - Fix headphone auto-toggle on sigmatel codec [ALSA] hda-intel - A slight cleanup of timeout check in azx_get_response() [ALSA] hda-codec - Fix mic input with STAC92xx codecs [ALSA] mixart: Use SEEK_{SET,CUR,END} instead of hardcoded values [ALSA] gus: Use SEEK_{SET,CUR,END} instead of hardcoded values [ALSA] opl4: Use SEEK_{SET,CUR,END} instead of hardcoded values [ALSA] sound core: Use SEEK_{SET,CUR,END} instead of hardcoded values [ALSA] hda-codec - Support multiple headphone pins [ALSA] hda_intel prefer 24bit instead of 20bit [ALSA] hda-codec - Add vendor ids for Motorola and Conexant [ALSA] hda-codec - Add device id for Motorola si3054-compatible codec [ALSA] Add missing compat ioctls for ALSA control API [ALSA] powermac - Fix Oops when conflicting with aoa driver [ALSA] aoa: add locking to tas codec [ALSA] hda-intel - Fix suspend/resume with MSI ...
No related branches found
No related tags found
Showing
- Documentation/sound/alsa/ALSA-Configuration.txt 39 additions, 5 deletionsDocumentation/sound/alsa/ALSA-Configuration.txt
- Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl 2 additions, 3 deletionsDocumentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
- include/sound/ac97_codec.h 32 additions, 0 deletionsinclude/sound/ac97_codec.h
- include/sound/ad1848.h 16 additions, 6 deletionsinclude/sound/ad1848.h
- include/sound/ak4xxx-adda.h 25 additions, 12 deletionsinclude/sound/ak4xxx-adda.h
- include/sound/asound.h 17 additions, 2 deletionsinclude/sound/asound.h
- include/sound/control.h 13 additions, 0 deletionsinclude/sound/control.h
- include/sound/core.h 6 additions, 4 deletionsinclude/sound/core.h
- include/sound/emu10k1.h 4 additions, 0 deletionsinclude/sound/emu10k1.h
- include/sound/info.h 4 additions, 3 deletionsinclude/sound/info.h
- include/sound/pcm.h 1 addition, 3 deletionsinclude/sound/pcm.h
- include/sound/timer.h 0 additions, 1 deletioninclude/sound/timer.h
- include/sound/tlv.h 60 additions, 0 deletionsinclude/sound/tlv.h
- include/sound/vx_core.h 1 addition, 0 deletionsinclude/sound/vx_core.h
- sound/aoa/codecs/Kconfig 4 additions, 0 deletionssound/aoa/codecs/Kconfig
- sound/aoa/codecs/snd-aoa-codec-tas.c 83 additions, 13 deletionssound/aoa/codecs/snd-aoa-codec-tas.c
- sound/core/control.c 136 additions, 24 deletionssound/core/control.c
- sound/core/control_compat.c 4 additions, 0 deletionssound/core/control_compat.c
- sound/core/device.c 9 additions, 11 deletionssound/core/device.c
- sound/core/hwdep.c 6 additions, 6 deletionssound/core/hwdep.c
Loading
Please register or sign in to comment