summaryrefslogtreecommitdiffstats
path: root/block/blk-map.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-04 15:33:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-04 15:33:30 -0700
commit56c225fe399c27c1f1a098048903f8e74f4ec45f (patch)
tree1edb26c6856af2ee731642f38be604109fdd4add /block/blk-map.c
parent53c566625fb872e7826a237f0f5c21458028e94a (diff)
parent075f01775f53640af4a2ca3ed8cbc71de6e37582 (diff)
downloadlinux-56c225fe399c27c1f1a098048903f8e74f4ec45f.tar.bz2
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 'block/blk-map.c')
0 files changed, 0 insertions, 0 deletions