From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Feb 2009 18:30:19 +0000 (-0800)
Subject: Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: firefly_0821_release~15598
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=896abeb743579fc8be0d16d15d6768a158a3a109;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux:
  lockd: fix regression in lockd's handling of blocked locks
---

896abeb743579fc8be0d16d15d6768a158a3a109