kernel_optimize_test/drivers/scsi/cxgbi
David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-15 11:59:32 -04:00
..
cxgb3i scsi: remove eh_timed_out methods in the transport template 2017-02-06 19:10:03 -05:00
cxgb4i Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-06-15 11:59:32 -04:00
Kconfig
libcxgbi.c scsi: cxgb4i: libcxgbi: in error case RST tcp conn 2017-06-02 14:59:19 -04:00
libcxgbi.h scsi: cxgb4i: libcxgbi: in error case RST tcp conn 2017-06-02 14:59:19 -04:00
Makefile