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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-01-25 11:17:34 -08:00
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	net/mlx4: Replace mlx4_en_mac_to_u64() with mlx4_mac_to_u64()	2014-03-02 20:04:01 -05:00
qp.h	net/mlx4: Set vlan stripping policy by the right command	2014-09-10 15:21:34 -07:00
srq.h	mlx4_core: Implement SRQ object lookup from srqn	2013-04-16 22:42:55 -07:00