tree 668d9adb29cb566f6240e7bc51faaf564d3241ca
parent dae816835e8d1276c9e50d9c4dba75b7705fe66c
parent 53e6d8d182e97c5211da4ee1f163c840c7ecf8ca
author Linus Torvalds <torvalds@linux-foundation.org> 1218584362 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1218584362 -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:
  fs/nfsd/export.c: Adjust error handling code involving auth_domain_put
  MAINTAINERS: mention lockd and sunrpc in nfs entries
  lockd: trivial sparse endian annotations