aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 13:36:17 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 13:36:17 -0800
commit2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde (patch)
treeafcc572acff2548cdabdfb0ec488508e1864daf1 /arch/um
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 (diff)
parentMAINTAINERS: update the NFS CLIENT entry (diff)
downloadlinux-dev-2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde.tar.xz
linux-dev-2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde.zip
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6: MAINTAINERS: update the NFS CLIENT entry NFS: Fix an Oops in NFS unmount Revert "NFS: Ensure we return zero if applications attempt to write zero bytes" SUNRPC xprtrdma: fix XDR tail buf marshalling for all ops NFSv2/v3: Fix a memory leak when using -onolock NFS: Fix NFS mountpoint crossing...
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions