staging: lustre: remove include/libcfs/linux/linux-bitops.h

It was just includeing bitops.h so do that instead in the one place that
was calling it.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

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