Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Aug 2008 23:39:22 +0000 (16:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Aug 2008 23:39:22 +0000 (16:39 -0700)
commitb0e0c9e7f6d5764633e93944dafd896dd6097318
tree668d9adb29cb566f6240e7bc51faaf564d3241ca
parentdae816835e8d1276c9e50d9c4dba75b7705fe66c
parent53e6d8d182e97c5211da4ee1f163c840c7ecf8ca
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
MAINTAINERS