tree 99f43fadbc0dc6c43d275d4c7fafd3b52cccb217
parent a62f735cbb1a0937ab6a9196dadf752694ef0b7f
parent 5216a8e70e25b01cbd2915cd0442fb96deb2c262
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1203643188 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1203643188 -0800

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:
  Wrap buffers used for rpc debug printks into RPC_IFDEBUG
  nfs: fix sparse warnings
  NFS: flush signals before taking down callback thread