Merge branch 'fortglx/3.12/time' into fortglx/3.13/time

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

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