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)
commit3d2aa66ddaa3008ae2c71bca07eb5e8b08170c4a
tree4d9bfc4017f038a7f94358c4061afcb264ba6d08
parent21ce3cd63365b0d07794adeb4325944bfa86fb4e
parent8dca419721d188bfee5f19fad45275856c619a5c
Merge branch 'topic/ctxfi' into for-linus

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