Skip to content
Commit b0e0c9e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents dae81683 53e6d8d1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment