]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 79bc79b) | patch
Revert "Merge branch 'odirect'"
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 28 Jun 2006 20:52:45 +0000 (16:52 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 28 Jun 2006 20:52:45 +0000 (16:52 -0400)
commit607f31e80b6f982d7c0dd7a5045377fc368fe507
treecaa7087b1aa90fe620f8a7a564bf07d94f8c1b69tree | snapshot
parent79bc79b07c9c6f8ae9290704e9e503a9327fcbb2commit | diff
Revert "Merge branch 'odirect'"

This reverts ccf01ef7aa9c6c293a1c64c27331a2ce227916ec commit.

No idea how git managed this one: when I asked it to merge the odirect
topic branch it actually generated a patch which reverted the change.

Reverting the 'merge' will once again reveal Chuck's recent NFS/O_DIRECT
work to the world.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/direct.c diff | blob | history
include/linux/nfs_xdr.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.