Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Wed, 17 Feb 2010 13:24:46 +0000 (14:24 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 17 Feb 2010 13:24:46 +0000 (14:24 +0100)
commit7fb3a069bc5d3577409c2ae89f89cd264ff85816
tree7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3
parent291186e049d7f8178ad31d43c38a53889f25d79e
parent9d3415a8cc76ff65c6602a121ac318432c5cd7ba
Merge branch 'fix/misc' into topic/misc

Conflicts:
sound/pci/hda/patch_realtek.c
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