mirror of https://github.com/torvalds/linux.git
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> |
||
|---|---|---|
| .. | ||
| can | ||
| dsa | ||
| allwinner,sun4i-emac.txt | ||
| allwinner,sun4i-mdio.txt | ||
| arc_emac.txt | ||
| broadcom-bcm87xx.txt | ||
| calxeda-xgmac.txt | ||
| cavium-mdio.txt | ||
| cavium-mix.txt | ||
| cavium-pip.txt | ||
| cdns-emac.txt | ||
| cpsw-phy-sel.txt | ||
| cpsw.txt | ||
| davicom-dm9000.txt | ||
| davinci-mdio.txt | ||
| davinci_emac.txt | ||
| fsl-fec.txt | ||
| fsl-tsec-phy.txt | ||
| gpmc-eth.txt | ||
| lpc-eth.txt | ||
| macb.txt | ||
| marvell-armada-370-neta.txt | ||
| marvell-orion-mdio.txt | ||
| marvell-orion-net.txt | ||
| mdio-gpio.txt | ||
| mdio-mux-gpio.txt | ||
| mdio-mux-mmioreg.txt | ||
| mdio-mux.txt | ||
| micrel-ks8851.txt | ||
| micrel-ksz9021.txt | ||
| moxa,moxart-mac.txt | ||
| phy.txt | ||
| smsc-lan91c111.txt | ||
| smsc911x.txt | ||
| stmmac.txt | ||
| via-velocity.txt | ||