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: add more format names
  sound: oss: fix uninitialized spinlock
  ALSA: asihpi - Return hw error directly from oustream_write.
  ASoC: soc-core: fix debugfs_pop_time file permissions
  ALSA: hda - Add Sony VAIO quirk for ALC269

...

This commit is contained in:

Linus Torvalds 2010-08-28 14:24:34 -07:00

parent 45b5bed7bc 9dde3f92a7

commit 6b3a7c0f8a

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

6

sound/core/pcm.c

View file

2

sound/oss/sound_timer.c

View file

7

sound/pci/asihpi/hpi6205.c

View file

1

sound/pci/hda/patch_realtek.c

View file

2

sound/soc/soc-core.c

View file