From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Aug 2008 23:39:22 +0000 (-0700)
Subject: Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.27-rc3~1
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b0e0c9e7f6d5764633e93944dafd896dd6097318;p=linux-2.6-omap-h63xx.git

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
---

b0e0c9e7f6d5764633e93944dafd896dd6097318