Merge branches 'perf-urgent-for-linus' and 'perf-core-for-linus' of git://git.kernel...

[~andy/linux] / drivers / staging / lustre / lustre / Makefile

obj-$(CONFIG_LUSTRE_FS) += libcfs/ lvfs/ obdclass/ ptlrpc/ fld/ osc/ mgc/ \
                           fid/ lov/ mdc/ lmv/ llite/ obdecho/