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:
  sound: virtuoso: revert "do not overwrite EEPROM on Xonar D2/D2X"
  ALSA: jack - Use card->shortname for input name
  ALSA: usb-audio - Workaround for misdetected sample rate with CM6207
  ALSA: usb-audio - Fix non-continuous rate detection
  sound: usb-audio: fix uninitialized variable with M-Audio MIDI interfaces
  Revert "Sound: hda - Restore PCI configuration space with interrupts off"

...

This commit is contained in:

Linus Torvalds 2009-02-19 08:35:29 -08:00

parent ba95fd47d1 e432472db2

commit a1342d3b8e

5 changed files with 19 additions and 29 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/jack.c

View file

8

sound/pci/hda/hda_intel.c

View file

17

sound/pci/oxygen/virtuoso.c

View file

20

sound/usb/usbaudio.c

View file

1

sound/usb/usbmidi.c

View file