From: Trond Myklebust Date: Wed, 28 Jun 2006 20:52:45 +0000 (-0400) Subject: Revert "Merge branch 'odirect'" X-Git-Tag: v2.6.18-rc1~4^2~7 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=607f31e80b6f982d7c0dd7a5045377fc368fe507;p=pandora-kernel.git 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 --- Reading git-diff-tree failed