merge b_devel into b_llpmd

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 118d070..2c2bf84 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -123,8 +123,6 @@ int it_open_error(int phase, struct lookup_intent *it)
 }
 EXPORT_SYMBOL(it_open_error);
 
-
-
 /* this must be called on a lockh that is known to have a referenced lock */
 void mdc_set_lock_data(__u64 *l, void *data)
 {