diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-14 11:09:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-14 11:09:05 -0800 |
| commit | 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd (patch) | |
| tree | dc44d88bc66d3e7ec4d1c9180d6d4289fe7c5901 /arch | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff) | |
| parent | nfsd: Fix possible BUG_ON firing in set_change_info (diff) | |
| download | linux-dev-5111711d3ed8f4f1012cac3ec3f2b463b549fbfd.tar.xz linux-dev-5111711d3ed8f4f1012cac3ec3f2b463b549fbfd.zip | |
Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.37' of git://linux-nfs.org/~bfields/linux:
nfsd: Fix possible BUG_ON firing in set_change_info
sunrpc: prevent use-after-free on clearing XPT_BUSY
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions