staging/lustre/libcfs: remove waitq_wait

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
Simple merge

diff --cc drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
Simple merge

diff --cc drivers/staging/lustre/lnet/lnet/lib-eq.c
Simple merge

diff --cc drivers/staging/lustre/lustre/fid/fid_request.c
Simple merge

diff --cc drivers/staging/lustre/lustre/include/lustre_lib.h
Simple merge

diff --cc drivers/staging/lustre/lustre/lclient/lcommon_cl.c
Simple merge

diff --cc drivers/staging/lustre/lustre/libcfs/debug.c
Simple merge

diff --cc drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c
Simple merge

diff --cc drivers/staging/lustre/lustre/lov/lov_object.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdclass/cl_lock.c
Simple merge

diff --cc drivers/staging/lustre/lustre/obdclass/lu_object.c
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
Simple merge