staging/lustre/libcfs: remove cfs_pause

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.c
Simple merge

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

diff --cc drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
Simple merge

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

diff --cc drivers/staging/lustre/lnet/lnet/api-ni.c
Simple merge

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

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

diff --cc drivers/staging/lustre/lnet/selftest/conrpc.c
Simple merge

diff --cc drivers/staging/lustre/lnet/selftest/rpc.c
Simple merge

diff --cc drivers/staging/lustre/lnet/selftest/selftest.h
Simple merge

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

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

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