Merge branch 'iks_for_rmk' of git://git.linaro.org/people/nico/linux into devel-stable

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

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