Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux
Linus Torvalds [Tue, 12 Aug 2008 23:39:22 +0000 (16:39 -0700)]
* '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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge