From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Apr 2013 18:29:34 +0000 (-0700)
Subject: Merge tag 'dlm-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
X-Git-Tag: v3.10-rc1~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c55f1463c1fd318d5e785f02b80bcc32176d342;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'dlm-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

Pull dlm update from David Teigland:
 "This includes a single patch to avoid fully processing a posix unlock
  from close when no posix locks exist on the file"

* tag 'dlm-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: avoid unnecessary posix unlock
---

8c55f1463c1fd318d5e785f02b80bcc32176d342