tree fca6b723f6c91f2af79b28f05c05e114720fbe66
parent 1136cf11066a32d4ac2a476dac302858d763703d
parent 91b80969ba466ba4b915a4a1d03add8c297add3f
author Linus Torvalds <torvalds@linux-foundation.org> 1220378291 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1220378291 -0700

Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.27' of git://linux-nfs.org/~bfields/linux:
  nfsd: fix buffer overrun decoding NFSv4 acl
  sunrpc: fix possible overrun on read of /proc/sys/sunrpc/transports
  nfsd: fix compound state allocation error handling
  svcrdma: Fix race between svc_rdma_recvfrom thread and the dto_tasklet