Skip to content
Commit 2c0d19a7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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
parents 05a33e3d 5a53a764
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment