Merge branch 'fixes' into devel

diff --cc sound/core/pcm_native.c
Simple merge

diff --cc sound/pci/ac97/ac97_patch.c
Simple merge

diff --cc sound/pci/hda/hda_codec.c
Simple merge

diff --cc sound/pci/hda/hda_codec.h
Simple merge

diff --cc sound/pci/hda/patch_analog.c
Simple merge

diff --cc sound/pci/hda/patch_sigmatel.c
Simple merge

diff --cc sound/usb/usbmidi.c
Simple merge