forked from Minki/linux
4fbef95af4
Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| e1000_82575.c | ||
| e1000_82575.h | ||
| e1000_defines.h | ||
| e1000_hw.h | ||
| e1000_i210.c | ||
| e1000_i210.h | ||
| e1000_mac.c | ||
| e1000_mac.h | ||
| e1000_mbx.c | ||
| e1000_mbx.h | ||
| e1000_nvm.c | ||
| e1000_nvm.h | ||
| e1000_phy.c | ||
| e1000_phy.h | ||
| e1000_regs.h | ||
| igb_ethtool.c | ||
| igb_hwmon.c | ||
| igb_main.c | ||
| igb_ptp.c | ||
| igb.h | ||
| Makefile | ||