Skip to content
Commit 3d2aa66d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/ctxfi' into for-linus 

* topic/ctxfi:
  ALSA: ctxfi - Fix deadlock with xfi-timer
  ALSA: ctxfi - Replace atc lock to mutex
parents 21ce3cd6 8dca4197
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