Merge tag 'v3.10-rc1' into stable/for-linus-3.10
[cascardo/linux.git] / drivers / staging / netlogic / Makefile
1 obj-$(CONFIG_NETLOGIC_XLR_NET) += xlr_net.o platform_net.o