From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Jan 2009 18:42:05 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
X-Git-Tag: v2.6.29-rc3~26
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  dlm: initialize file_lock struct in GETLK before copying conflicting lock
  dlm: fix plock notify callback to lockd
---

a90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35