diff options
author | Linus Torvalds | 2010-06-09 21:43:04 +0200 |
---|---|---|
committer | Linus Torvalds | 2010-06-09 21:43:04 +0200 |
commit | b95a56809343fb727c818ad1b9da14a17fa92ef6 (patch) | |
tree | b79ff0d36f216fcadce546aa33219e06f1126b58 /fs/ceph | |
parent | FRV: Reinstate null behaviour for the GDB remote protocol 'p' command (diff) | |
parent | Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming (diff) | |
download | kernel-qcow2-linux-b95a56809343fb727c818ad1b9da14a17fa92ef6.tar.gz kernel-qcow2-linux-b95a56809343fb727c818ad1b9da14a17fa92ef6.tar.xz kernel-qcow2-linux-b95a56809343fb727c818ad1b9da14a17fa92ef6.zip |
Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.35' of git://linux-nfs.org/~bfields/linux:
nfsd4: shut down callback queue outside state lock
nfsd: nfsd_setattr needs to call commit_metadata
Diffstat (limited to 'fs/ceph')
0 files changed, 0 insertions, 0 deletions