d247b6ab3c
Conflicts: drivers/net/Makefile net/ipv6/sysctl_net_ipv6.c Two ipv6_table_template[] additions overlap, so the index of the ipv6_table[x] assignments needed to be adjusted. In the drivers/net/Makefile case, we've gotten rid of the garbage whereby we had to list every single USB networking driver in the top-level Makefile, there is just one "USB_NETWORKING" that guards everything. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| amd-xgbe-phy.c | ||
| amd.c | ||
| at803x.c | ||
| bcm7xxx.c | ||
| bcm63xx.c | ||
| bcm87xx.c | ||
| broadcom.c | ||
| cicada.c | ||
| davicom.c | ||
| dp83640.c | ||
| dp83640_reg.h | ||
| et1011c.c | ||
| fixed.c | ||
| icplus.c | ||
| lxt.c | ||
| marvell.c | ||
| mdio-bitbang.c | ||
| mdio-gpio.c | ||
| mdio-moxart.c | ||
| mdio-mux-gpio.c | ||
| mdio-mux-mmioreg.c | ||
| mdio-mux.c | ||
| mdio-octeon.c | ||
| mdio-sun4i.c | ||
| mdio_bus.c | ||
| micrel.c | ||
| national.c | ||
| phy.c | ||
| phy_device.c | ||
| qsemi.c | ||
| realtek.c | ||
| smsc.c | ||
| spi_ks8995.c | ||
| ste10Xp.c | ||
| vitesse.c | ||