David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

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

2016-08-18 01:17:32 -04:00

..

common_hsi.h

qed: Add iscsi/rdma personalities

2016-06-03 20:08:39 -04:00

eth_common.h

qed: Utilize FW 8.10.3.0

2016-06-02 21:30:03 -07:00

iscsi_common.h

qed: Add common HSI for new protocols

2016-06-03 20:08:39 -04:00

qed_chain.h

qed: Fix next-ptr chains for BE / 32-bit

2016-06-03 22:42:26 -07:00

qed_eth_if.h

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

2016-06-30 05:03:36 -04:00

qed_if.h

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

2016-08-18 01:17:32 -04:00

qed_iov_if.h

qed*: support ndo_get_vf_config

2016-05-12 00:04:08 -04:00

rdma_common.h

qed: Add common HSI for new protocols

2016-06-03 20:08:39 -04:00

roce_common.h

qed: Add common HSI for new protocols

2016-06-03 20:08:39 -04:00

storage_common.h

qed: Add common HSI for new protocols

2016-06-03 20:08:39 -04:00

tcp_common.h

qed: Add common HSI for new protocols

2016-06-03 20:08:39 -04:00