]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'dlm-4.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Aug 2016 03:18:49 +0000 (20:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 Aug 2016 03:18:49 +0000 (20:18 -0700)
Pull dlm fix from David Teigland:
 "This fixes a bug introduced by recent debugfs cleanup"

* tag 'dlm-4.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: fix malfunction of dlm_tool caused by debugfs changes


Trivial merge