Merge branch 'topic/pcm-drain-nonblock' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:33:00 +0000 (15:33 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:33:00 +0000 (15:33 +0200)
commit2c0d19a78de1ea5d0e92d86be0b16ccab0feccec
tree190cfbbe1a465755c575aef23e6c37495a00536c
parent05a33e3d6fdca6ae3f645cc7bca9c11a4476e84c
parent5a53a7640a7af7acf904ed805c6fd1bf9fea829c
Merge branch 'topic/pcm-drain-nonblock' into for-linus

* topic/pcm-drain-nonblock:
  ALSA: pcm - Increase protocol version
  ALSA: pcm - Fix drain behavior in non-blocking mode
sound/core/pcm_lib.c