From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 18 May 2008 22:32:44 +0000 (-0700)
Subject: Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Tag: v2.6.26-rc4~126
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=161fb0cf5c7e94cd0490e4bd04edcf1e24d1d288;p=linux-2.6-omap-h63xx.git

Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  SUNRPC: AUTH_SYS "machine creds" shouldn't use negative valued uid/gid
  nfs: make nfs4_drop_state_owner() static
  nfs: path_{get,put}() cleanups
  nfs: replace remaining __FUNCTION__ occurrences
  nfs/lsm: make NFSv4 set LSM mount options
  NFSv4: Check the return value of decode_compound_hdr_arg()
  nfs: fix race in nfs_dirty_request
  NFS: Ensure that 'noac' and/or 'actimeo=0' turn off attribute caching
---

161fb0cf5c7e94cd0490e4bd04edcf1e24d1d288