David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_alb.c drivers/net/ethernet/altera/altera_msgdma.c drivers/net/ethernet/altera/altera_sgdma.c net/ipv6/xfrm6_output.c Several cases of overlapping changes. The xfrm6_output.c has a bug fix which overlaps the renaming of skb->local_df to skb->ignore_df. In the Altera TSE driver cases, the register access cleanups in net-next overlapped with bug fixes done in net. Similarly a bug fix to send ALB packets in the bonding driver using the right source address overlaps with cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-24 00:32:30 -04:00
..
cmd.h	mlx4: Add support for CONFIG_DEV command	2014-03-28 16:29:35 -04: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	net/mlx4_core: Deprecate use_prio module parameter	2014-05-22 17:17:29 -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_core: Add UPDATE_QP SRIOV wrapper support	2014-05-16 15:12:45 -04:00
srq.h	mlx4_core: Implement SRQ object lookup from srqn	2013-04-16 22:42:55 -07:00