Merge branch 'fix/misc' into topic/misc
Takashi Iwai [Wed, 17 Feb 2010 13:24:46 +0000 (14:24 +0100)]
Conflicts:
sound/pci/hda/patch_realtek.c

1  2 
sound/core/pcm_native.c
sound/pci/atiixp.c
sound/pci/echoaudio/echoaudio.c
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c
sound/pci/riptide/riptide.c
sound/usb/usbaudio.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge