Land b_unify on b_devel.

Highlights include:
 - intent rework from Peter and Phil
 - unification of VFS intent strategy for 2.4 and 2.5/2.6
 - select 2.5 kernel patches from b_ad
 - all the whitespace fixes you can imagine.

Complete diff for sanity-checking at http://off.net/~shaver/unify-landing.diff.

diff --git a/lustre/tests/.cvsignore b/lustre/tests/.cvsignore
index f753c56..3ffa345 100644 (file)
--- a/lustre/tests/.cvsignore
+++ b/lustre/tests/.cvsignore
@@ -41,6 +41,7 @@ runas
 openfile
 unlinkmany
 fchdir_test
+*.cmd
 getdents
 o_directory
 mkdirdeep