]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit88830560f4e94ada4846d91292d537a582c01bc9
tree8b5f6ce348ea00e5f67de8f67001fdbfd248de32
parent800c74db7d22dbf84c60e3481e5a2fabad3573b4
parent71d2fd7871d91b492b7ae1c75ef1f03815ad17db
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