Merge commit alsa/devel into topic/misc

Conflicts:
	include/sound/version.h

diff --cc include/sound/pcm.h
Simple merge

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

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

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

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

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

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

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

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