Merge commit 'v2.6.34-rc6' into core/locking
[pandora-kernel.git] / net / dcb / Makefile
1 obj-$(CONFIG_DCB) += dcbnl.o