Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: cmipci: work around invalid PCM pointer
  ASoC: Remove BROKEN from i.MX audio after dependencies merged
  ALSA: hda - Fix access-after-free in patch_realtek.c
  ALSA: hda - Sort codec entry list of Nvidia HDMI
  ALSA: hda - Add support of Nvidia GT220 HDMI
  ALSA: hda: Fix 0 dB offset for HP laptops using CX20551 (Waikiki)
  ALSA: hda - Add PCI quirk for HP dv6-1110ax.
  sound/oss/vidc.c: change the field used with DMA_ACTIVE
  ASoC: pxa-pcm-lib: initialize DMA channel to -1
  ASoC: Bail out of wm_hubs DC servo if calibration fails
  ASoC: tlv320dac33: Internal clocking changes
  ASoC: tlv320dac33: Fix DSP modes
  ASoC: SIU driver shall select FW_LOADER

...

This commit is contained in:

Linus Torvalds 2010-03-24 16:34:33 -07:00

parent 90fddabf58 12180024cc

commit 20dba4596f

11 changed files with 49 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

sound/arm/pxa2xx-pcm-lib.c

View file

4

sound/oss/vidc.c

View file

14

sound/pci/cmipci.c

View file

15

sound/pci/hda/patch_conexant.c

View file

15

sound/pci/hda/patch_nvhdmi.c

View file

5

sound/pci/hda/patch_realtek.c

View file

2

sound/pci/hda/patch_sigmatel.c

View file

10

sound/soc/codecs/tlv320dac33.c

View file

2

sound/soc/codecs/wm_hubs.c

View file

2

sound/soc/imx/Kconfig

View file

1

sound/soc/sh/Kconfig

View file