Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 May 2008 22:32:44 +0000 (15:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 18 May 2008 22:32:44 +0000 (15:32 -0700)
commit161fb0cf5c7e94cd0490e4bd04edcf1e24d1d288
tree38b0da03ce66f053e8cfed6c081c62aef22a544d
parentb8291ad07a7f3b5b990900f0001198ac23ba893e
parentb4528762ca92261c6ed3f03e76adeb1dc587aacb
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