Merge tag 'dlm-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
commitf0230294271f511b41797305b685365a9e569a09
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 06:31:13 +0000 (13 15:31 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 06:31:13 +0000 (13 15:31 +0900)
treef6d2d36c414eeaf0c36061a25b80ba5f6b1e5644
parent39222c82f738190a4f09be89510a8336a73b67c8
parenta97f4a66d8ee4faf0f31cc4ad3f4aa0baef23fc7
Merge tag 'dlm-3.13' of git://git./linux/kernel/git/teigland/linux-dlm

Pull dlm fix from David Teigland:
 "This set includes a single fix to resolve to a race that could cause
  lockspace shutdown to incorrectly return -EBUSY"

* tag 'dlm-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY