Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts ...

Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2017-11-07 10:32:44 +01:00

..

e1000_82575.c

igb: support BCM54616 PHY

2017-08-08 18:09:12 -07:00

e1000_82575.h

igb: support RX flow classification by ethertype

2016-08-18 22:27:48 -07:00

e1000_defines.h

igb: support BCM54616 PHY

2017-08-08 18:09:12 -07:00

e1000_hw.h

igb: support BCM54616 PHY

2017-08-08 18:09:12 -07:00

e1000_i210.c

igb: Fix hw_dbg logging in igb_update_flash_i210

2017-01-06 02:23:22 -08:00

e1000_i210.h

igb: Remove GS40G specific defines/functions

2015-12-14 10:20:06 -08:00

e1000_mac.c

igb: Realign bad indentation

2017-01-06 02:18:49 -08:00

e1000_mac.h

igb: Merge VLVF configuration into igb_vfta_set

2016-02-15 16:36:52 -08:00

e1000_mbx.c

igb: do not drop PF mailbox lock after read of VF message

2017-08-08 17:52:45 -07:00

e1000_mbx.h

igb: do not drop PF mailbox lock after read of VF message

2017-08-08 17:52:45 -07:00

e1000_nvm.c

igb: use BIT() macro or unsigned prefix

2016-05-13 14:39:47 -07:00

e1000_nvm.h

igb: Cleanups to change comment style on license headers

2014-04-24 17:26:27 -07:00

e1000_phy.c

scripts/spelling.txt: add regsiter -> register spelling mistake

2017-05-08 17:15:13 -07:00

e1000_phy.h

igb: use BIT() macro or unsigned prefix

2016-05-13 14:39:47 -07:00

e1000_regs.h

locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()

2017-10-25 11:01:08 +02:00

igb_ethtool.c

igb: Remove useless argument

2017-06-06 01:04:13 -07:00

igb_hwmon.c

igb: Cleanups to change comment style on license headers

2014-04-24 17:26:27 -07:00

igb_main.c

Merge branch 'linus' into locking/core, to resolve conflicts

2017-11-07 10:32:44 +01:00

igb_ptp.c

igb: check for Tx timestamp timeouts during watchdog

2017-06-06 01:03:17 -07:00

igb.h

igb: Remove useless argument

2017-06-06 01:04:13 -07:00

Makefile

igb: Update license text to remove FSF address and update copyright.

2014-02-26 15:54:52 -05:00