projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7be0d4f
f6360ef
)
Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:05:55 +0000
(14:05 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:05:55 +0000
(14:05 -0700)
* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux:
nfsd: fix NULL dereference in nfsd_statfs()
nfsd4: fix downgrade/lock logic
nfsd4: typo fix in find_any_file
nfsd4: bad BUG() in preprocess_stateid_op
Trivial merge