Merge remote-tracking branch 'linus/master' into x86/urgent
[cascardo/linux.git] / drivers / net / ethernet / calxeda / Makefile
1 obj-$(CONFIG_NET_CALXEDA_XGMAC) += xgmac.o