Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Feb 2009 18:30:19 +0000 (10:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Feb 2009 18:30:19 +0000 (10:30 -0800)
commit896abeb743579fc8be0d16d15d6768a158a3a109
tree8b5f6ce348ea00e5f67de8f67001fdbfd248de32
parentf06da264cfb0f9444d41ca247213e419f90aa72a
parent9d9b87c1218be78ddecbc85ec3bb91c79c1d56ab
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