diff options
author | 2009-06-16 17:38:40 +0200 | |
---|---|---|
committer | 2009-06-16 17:38:40 +0200 | |
commit | 3d2aa66ddaa3008ae2c71bca07eb5e8b08170c4a (patch) | |
tree | 4d9bfc4017f038a7f94358c4061afcb264ba6d08 /fs/jbd2/commit.c | |
parent | Merge branch 'topic/asoc' into for-linus (diff) | |
parent | ALSA: ctxfi - Fix deadlock with xfi-timer (diff) | |
download | linux-dev-3d2aa66ddaa3008ae2c71bca07eb5e8b08170c4a.tar.xz linux-dev-3d2aa66ddaa3008ae2c71bca07eb5e8b08170c4a.zip |
Merge branch 'topic/ctxfi' into for-linus
* topic/ctxfi:
ALSA: ctxfi - Fix deadlock with xfi-timer
ALSA: ctxfi - Replace atc lock to mutex
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions