Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

path: root/bpfc/Makefile

bpfc-libs =

bpfc-objs =	xmalloc.o \
		str.o \
		bpf.o \
		bpf_lexer.yy.o \
		bpf_parser.tab.o \
		die.o \
		sysctl.o \
		proc.o \
		cpp.o \
		bpfc.o

bpfc-lex =	bpf_lexer.yy.o

bpfc-yaac =	bpf_parser.tab.o

bpfc-eflags =	-I..

bpfc-confs =

bpfc_clean_custom:
	$(Q)$(call RM,$(BUILD_DIR)/*.h $(BUILD_DIR)/*.c)