Merge tag 'dlm-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Mar 2016 18:24:28 +0000 (13:24 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Mar 2016 18:24:28 +0000 (13:24 -0500)
Pull dlm fix from David Teigland:
 "This fixes a bug from the configfs cleanup"

* tag 'dlm-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: config: Fix ENOMEM failures in make_cluster()


Trivial merge