Merge commit alsa/devel into topic/misc
Takashi Iwai [Tue, 12 Jan 2010 08:40:08 +0000 (09:40 +0100)]
Conflicts:
include/sound/version.h

1  2 
include/sound/pcm.h
sound/core/pcm_lib.c
sound/core/pcm_native.c
sound/pci/hda/hda_codec.c
sound/pci/hda/patch_analog.c
sound/pci/hda/patch_cirrus.c
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c

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