Merge branch 'devel' of git.alsa-project.org:alsa-kernel into topic/misc
Takashi Iwai [Wed, 13 Jan 2010 07:32:53 +0000 (08:32 +0100)]
1  2 
sound/core/pcm_lib.c

Simple merge