Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 1e8d4e8b
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (32 commits)
      ALSA: hda: Conexant: Allow different output types to share DAC
      ASoC: Correct element count for WM8996 sidetone HPF
      ASoC: Tegra: wm8903 machine driver: Drop Ventana support
      ASoC: Add samsung maintainer
      ASoC: Add Springbank I/O card to Speyside Kconfig
      ALSA: hda/conexant - Enable ADC-switching for auto-mic mode, too
      ALSA: hda - Fix double-headphone/speaker paths for Cxt auto-parser
      ALSA: hda - Update jack-sense info even when no automute is set
      ALSA: hda - Fix output-path initialization for Realtek auto-parser
      sound/soc/fsl/mpc8610_hpcd.c: add missing of_node_put
      sound/soc/fsl/p1022_ds.c: add missing of_node_put
      sound/soc/ep93xx/ep93xx-i2s.c: add missing kfree
      sound/soc/kirkwood/kirkwood-i2s.c: add missing kfree
      ASoC: soc-core: use GFP_KERNEL flag for kmalloc in snd_soc_cnew
      sound/soc/fsl/fsl_dma.c: add missing of_node_put
      ASoC: Clear completions from late WM8996 FLL lock IRQs
      ASoC: Clear any outstanding WM8962 FLL lock completions before waiting
      ASoC: Ensure we only run Speyside WM8962 bias level callbacks once
      ASoC: Fix configuration of WM8996 input enables
      ASoC: WM8996 record paths need AIFCLK
      ...
    1e8d4e8b