linux/drivers/net/ethernet/intel/igb
David S. Miller a06ee256e5 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Version bump conflict in batman-adv, take what's in net-next.

iavf conflict, adjustment of netdev_ops in net-next conflicting
with poll controller method removal in net.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-09-25 10:35:29 -07:00
..
e1000_82575.c igb: e1000_82575: Mark expected switch fall-through 2018-08-07 17:54:20 -07:00
e1000_82575.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
e1000_defines.h igb: Add support for ETF offload 2018-07-04 22:30:28 +09:00
e1000_hw.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
e1000_i210.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
e1000_i210.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
e1000_mac.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
e1000_mac.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
e1000_mbx.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
e1000_mbx.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
e1000_nvm.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
e1000_nvm.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
e1000_phy.c igb: e1000_phy: Mark expected switch fall-through 2018-08-07 17:54:20 -07:00
e1000_phy.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
e1000_regs.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
igb_ethtool.c igb: Replace mdelay() with msleep() in igb_integrated_phy_loopback() 2018-08-24 08:52:35 -07:00
igb_hwmon.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
igb_main.c Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2018-09-25 10:35:29 -07:00
igb_ptp.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
igb.h igb: Add support for ETF offload 2018-07-04 22:30:28 +09:00
Makefile net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00