David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx5/core/en.h drivers/net/ethernet/mellanox/mlx5/core/en_main.c drivers/net/usb/r8152.c All three conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-07-06 10:35:22 -07:00
..
cmd.h	net/mlx5_core: Fix Mellanox copyright note	2015-04-02 16:33:42 -04:00
cq.h	net/mlx5_core: Use tasklet for user-space CQ completion events	2016-05-18 10:45:49 -04:00
device.h	net/mlx5: Rate limit tables support	2016-06-27 04:10:40 -04:00
doorbell.h	net/mlx5_core: Fix Mellanox copyright note	2015-04-02 16:33:42 -04:00
driver.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-07-06 10:35:22 -07:00
fs.h	net/mlx5e: Add ethtool flow steering support	2016-07-05 00:06:02 -07:00
mlx5_ifc.h	Mellanox shared code between RDMA and net-next trees	2016-06-15 21:37:10 -07:00
port.h	net/mlx5e: Report correct auto negotiation and allow toggling	2016-06-27 04:10:41 -04:00
qp.h	Round two of 4.7 rc fixes	2016-06-24 18:52:31 -07:00
srq.h	net/mlx5_core: Fix Mellanox copyright note	2015-04-02 16:33:42 -04:00
transobj.h	IB/mlx5: Support setting Ethernet priority for Raw Packet QPs	2016-01-21 12:01:09 -05:00
vport.h	net/mlx5: E-Switch, Modify node guid on vf set MAC	2016-06-09 22:06:26 -07:00