Merge branch 'topic/ctxfi' into for-linus

* topic/ctxfi:
  ALSA: ctxfi - Fix deadlock with xfi-timer
  ALSA: ctxfi - Replace atc lock to mutex
This commit is contained in:
Takashi Iwai 2009-06-16 17:38:40 +02:00
commit 3d2aa66dda
3 changed files with 21 additions and 23 deletions