Merge trivial changes from head to branch.

This includes the append fix from the head.

diff --git a/lustre/llite/sysctl.c b/lustre/llite/sysctl.c
index 3c4ce1f..ee4ac75 100644 (file)
--- a/lustre/llite/sysctl.c
+++ b/lustre/llite/sysctl.c
@@ -1,4 +1,6 @@
-/*
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
  * Copyright (C) 2001  Cluster File Systems, Inc.
  *
  * This code is issued under the GNU General Public License.