Merge branch 'topic/ctxfi' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 16 Jun 2009 15:38:40 +0000 (17:38 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 16 Jun 2009 15:38:40 +0000 (17:38 +0200)
* topic/ctxfi:
  ALSA: ctxfi - Fix deadlock with xfi-timer
  ALSA: ctxfi - Replace atc lock to mutex


Trivial merge