aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-12 16:39:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-12 16:39:22 -0700
commitb0e0c9e7f6d5764633e93944dafd896dd6097318 (patch)
tree668d9adb29cb566f6240e7bc51faaf564d3241ca /Makefile
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (diff)
parentfs/nfsd/export.c: Adjust error handling code involving auth_domain_put (diff)
downloadlinux-dev-b0e0c9e7f6d5764633e93944dafd896dd6097318.tar.xz
linux-dev-b0e0c9e7f6d5764633e93944dafd896dd6097318.zip
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions