diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-04 15:33:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-04 15:33:30 -0700 |
| commit | 56c225fe399c27c1f1a098048903f8e74f4ec45f (patch) | |
| tree | 1edb26c6856af2ee731642f38be604109fdd4add /fs/fuse | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs (diff) | |
| parent | dlm: use INFO for recovery messages (diff) | |
| download | linux-dev-56c225fe399c27c1f1a098048903f8e74f4ec45f.tar.xz linux-dev-56c225fe399c27c1f1a098048903f8e74f4ec45f.zip | |
Merge tag 'dlm-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm updates from David Teigland:
"This set includes a couple trivial cleanups and changes recovery log
messages from DEBUG to INFO"
* tag 'dlm-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: use INFO for recovery messages
fs: Include appropriate header file in dlm/ast.c
dlm: silence a harmless use after free warning
Diffstat (limited to 'fs/fuse')
0 files changed, 0 insertions, 0 deletions