staging/lustre/libcfs: remove cfs_capable

Cc: Andreas Dilger <andreas.dilger@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/curproc.h
Simple merge

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

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

diff --cc drivers/staging/lustre/lustre/llite/dir.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/file.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/xattr.c
Simple merge

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

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

diff --cc drivers/staging/lustre/lustre/obdecho/echo_client.c
Simple merge

diff --cc drivers/staging/lustre/lustre/osc/osc_cache.c
Simple merge

diff --cc drivers/staging/lustre/lustre/osc/osc_io.c
Simple merge

diff --cc drivers/staging/lustre/lustre/osc/osc_page.c
Simple merge