diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-09 10:30:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-09 10:30:19 -0800 |
| commit | 896abeb743579fc8be0d16d15d6768a158a3a109 (patch) | |
| tree | 8b5f6ce348ea00e5f67de8f67001fdbfd248de32 /scripts | |
| parent | f06da264cfb0f9444d41ca247213e419f90aa72a (diff) | |
| parent | 9d9b87c1218be78ddecbc85ec3bb91c79c1d56ab (diff) | |
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
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions