diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-11 15:45:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-11 15:45:17 -0700 |
| commit | 18770c7c3a0ccd60017ac76b5d2e7d1f71376b94 (patch) | |
| tree | 548e113ab83307d25e41ea1e67ace6f53b194798 /fs/jbd2/journal.c | |
| parent | Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
| parent | nfsd4: fix oops on lock failure (diff) | |
| download | linux-dev-18770c7c3a0ccd60017ac76b5d2e7d1f71376b94.tar.xz linux-dev-18770c7c3a0ccd60017ac76b5d2e7d1f71376b94.zip | |
Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.39' of git://linux-nfs.org/~bfields/linux:
nfsd4: fix oops on lock failure
nfsd: fix auth_domain reference leak on nlm operations
Diffstat (limited to 'fs/jbd2/journal.c')
0 files changed, 0 insertions, 0 deletions