From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 10 Sep 2009 13:33:00 +0000 (+0200)
Subject: Merge branch 'topic/pcm-drain-nonblock' into for-linus
X-Git-Tag: v2.6.32-rc1~732^2~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2c0d19a78de1ea5d0e92d86be0b16ccab0feccec;p=~shefty%2Frdma-dev.git

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
---

2c0d19a78de1ea5d0e92d86be0b16ccab0feccec