David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

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

2014-09-23 12:09:27 -04:00

..

cmd.h

mlx4_core: Add support for secure-host and SMP firewall

2014-08-05 07:40:22 -07:00

cq.h

…

device.h

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

2014-09-23 12:09:27 -04:00

doorbell.h

…

driver.h

…

qp.h

net/mlx4: Set vlan stripping policy by the right command

2014-09-10 15:21:34 -07:00

srq.h

…