| commit | 56c225fe399c27c1f1a098048903f8e74f4ec45f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 04 15:33:30 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 04 15:33:30 2014 -0700 |
| tree | 1edb26c6856af2ee731642f38be604109fdd4add | |
| parent | 53c566625fb872e7826a237f0f5c21458028e94a [diff] | |
| parent | 075f01775f53640af4a2ca3ed8cbc71de6e37582 [diff] |
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