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: pcm_oss: AFMT_S24_LE is set twice in return value
  ALSA: ASoC: email - update email addresses.
  OMAP: ASoC: Fix spinlock misuse in omap-pcm.c
  ALSA: hda - No widget selection for volume knob widgets in proc output
  ALSA: hda - Add support of iMac 24 Aluminium
  ALSA: alsa: time reaches -1, tested 0
  ALSA: hda - Add quirk for another HP dv5 model

...

This commit is contained in:

Linus Torvalds 2009-02-04 09:39:12 -08:00

parent eda58a85ec 7df0eb424d

commit 9dfea1b46d

10 changed files with 14 additions and 10 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

2

sound/core/oss/pcm_oss.c

View file

3

sound/pci/hda/hda_proc.c

View file

1

sound/pci/hda/patch_realtek.c

View file

2

sound/pci/hda/patch_sigmatel.c

View file

2

sound/pci/intel8x0.c

View file

2

sound/soc/atmel/atmel_ssc_dai.c

View file

2

sound/soc/atmel/atmel_ssc_dai.h

View file

2

sound/soc/codecs/wm8350.c

View file

3

sound/soc/codecs/wm8990.c

View file

5

sound/soc/omap/omap-pcm.c

View file