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
..
hw_atl	net: aquantia: atlantic: remove declaration of hw_atl_utils_hw_set_power	2017-06-10 16:09:56 -04:00
Makefile	…
aq_cfg.h	aquantia: Fix driver name reported by ethtool	2017-05-04 11:07:20 -04:00
aq_common.h	…
aq_ethtool.c	net: aquantia: atlantic: use new api ethtool_{get|set}_link_ksettings	2017-01-31 13:10:45 -05:00
aq_ethtool.h	net: ethernet: aquantia: Ethtool support	2017-01-24 15:03:41 -05:00
aq_hw.h	net: ethernet: aquantia: Hardware interface and utility functions	2017-01-24 15:03:40 -05:00
aq_hw_utils.c	net: ethernet: aquantia: Hardware interface and utility functions	2017-01-24 15:03:40 -05:00
aq_hw_utils.h	net: ethernet: aquantia: return -ETIME in macro AQ_HW_WAIT_FOR	2017-01-29 18:24:00 -05:00
aq_main.c	net:ethernet:aquantia: Remove adapter re-opening when MTU changed.	2017-03-24 12:32:19 -07:00
aq_main.h	net: ethernet: aquantia: Support for NIC-specific code	2017-01-24 15:03:39 -05:00
aq_nic.c	aquantia: Fix "ethtool -S" crash when adapter down.	2017-05-08 12:53:12 -04:00
aq_nic.h	net: aquantia: atlantic: use new api ethtool_{get|set}_link_ksettings	2017-01-31 13:10:45 -05:00
aq_nic_internal.h	net: ethernet: aquantia: Call netdev_register after all initialized.	2017-02-20 17:11:09 -05:00
aq_pci_func.c	net: ethernet: aquantia: call set_irq_affinity_hint before free_irq	2017-03-12 23:08:35 -07:00
aq_pci_func.h	net: ethernet: aquantia: PCI operations	2017-01-24 15:03:40 -05:00
aq_ring.c	sk_buff: remove support for csum_bad in sk_buff	2017-05-19 19:21:29 -04:00
aq_ring.h	net:ethernet:aquantia: Fix for LSO with IPv6.	2017-03-24 12:32:19 -07:00
aq_rss.h	net: ethernet: aquantia: Receive side scaling	2017-01-24 15:03:41 -05:00
aq_utils.h	net: ethernet: aquantia: Removed busy_count field.	2017-02-20 17:11:09 -05:00
aq_vec.c	net: aquantia: remove function aq_ring_tx_deinit	2017-02-20 10:23:41 -05:00
aq_vec.h	net: ethernet: aquantia: Vector operations	2017-01-24 15:03:40 -05:00
ver.h	…