| commit | 949b211235cf301790ef4fb903af65d71be29b2a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Apr 19 10:46:59 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Apr 19 10:46:59 2006 -0700 |
| tree | 083f7e30e4d48d3c812cef1c8b585522df086c3c | |
| parent | 0efd9323f32c137b5cf48bc6582cd08556e7cdfc [diff] | |
| parent | a5f9145bc9c340bda743ad51e09bdea60fa3ddfa [diff] |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 * git://git.linux-nfs.org/pub/linux/nfs-2.6: SUNRPC: Dead code in net/sunrpc/auth_gss/auth_gss.c NFS: remove needless check in nfs_opendir() NFS: nfs_show_stats; for_each_possible_cpu(), not NR_CPUS NFS: make 2 functions static NFS,SUNRPC: Fix compiler warnings if CONFIG_PROC_FS & CONFIG_SYSCTL are unset NFS: fix PROC_FS=n compile error VFS: Fix another open intent Oops RPCSEC_GSS: fix leak in krb5 code caused by superfluous kmalloc