From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 19 Apr 2006 17:46:59 +0000 (-0700)
Subject: Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
X-Git-Tag: v2.6.17-rc3~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=949b211235cf301790ef4fb903af65d71be29b2a;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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
---

949b211235cf301790ef4fb903af65d71be29b2a