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)
commit07c0db771dffe5856c8456e40e2d3066a351e270
treea8f1d778efe51ae60a230d1d908baedebf0f1bde
parent8b8c877febd2610050758f1b7b97050a7d2dc794
parent82c7d823cc31cf56d964eebe1f91aaf1691cddce
Merge tag 'dlm-4.6-fixes' of git://git./linux/kernel/git/teigland/linux-dlm

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()