diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 13:36:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 13:36:17 -0800 |
| commit | 2cc3a8f6ac0fb1e6095a47001d31aadcf9722bde (patch) | |
| tree | afcc572acff2548cdabdfb0ec488508e1864daf1 /drivers/ata | |
| parent | 23afc5c67588c92a062b4828a97b119755dffb51 (diff) | |
| parent | 78f5815368837ae7e3a0d3709c9f95f74e4d8537 (diff) | |
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 'drivers/ata')
0 files changed, 0 insertions, 0 deletions