Merge branch 'devel' of git://git.alsa-project.org/alsa-kernel into topic/misc
Takashi Iwai [Mon, 5 Jul 2010 13:37:27 +0000 (15:37 +0200)]
1  2 
include/sound/pcm.h

Simple merge