Merge tag 'dlm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Jul 2016 17:47:24 +0000 (10:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Jul 2016 17:47:24 +0000 (10:47 -0700)
commitba4f67899f9b3091744da4a4ce4057123ed02c4e
treef5f9fffaa3f0b67a6e143b5650b11324c124b58c
parent4fc29c1aa375353ffe7c8fa171bf941b71ce29ef
parent5c93f56f770e69c4cf2dbaebecd6bcca205949f9
Merge tag 'dlm-4.8' of git://git./linux/kernel/git/teigland/linux-dlm

Pull dlm updates from David Teigland:
 "This set includes two trivial changes, one to use kmemdup and another
  to control the log level of recovery messages"

* tag 'dlm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: Use kmemdup instead of kmalloc and memcpy
  dlm: add log_info config option