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
This commit is contained in:
Linus Torvalds 2009-02-09 10:30:19 -08:00
commit 896abeb743