From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 16 Jun 2009 15:38:40 +0000 (+0200)
Subject: Merge branch 'topic/ctxfi' into for-linus
X-Git-Tag: firefly_0821_release~13628^2~12
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3d2aa66ddaa3008ae2c71bca07eb5e8b08170c4a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'topic/ctxfi' into for-linus

* topic/ctxfi:
  ALSA: ctxfi - Fix deadlock with xfi-timer
  ALSA: ctxfi - Replace atc lock to mutex
---

3d2aa66ddaa3008ae2c71bca07eb5e8b08170c4a