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: v2.6.31-rc1~308^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3d2aa66ddaa3008ae2c71bca07eb5e8b08170c4a;p=~shefty%2Frdma-dev.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