Merge branch 'linus' into release
[linux-2.6] / net / dcb / Makefile
1 obj-$(CONFIG_DCB) += dcbnl.o