David S. Miller 6bb8824732 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/ipv6/ip6_gre.c is a case of parallel adds. include/trace/events/tcp.h is a little bit more tricky. The removal of in-trace-macro ifdefs in 'net' paralleled with moving show_tcp_state_name and friends over to include/trace/events/sock.h in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-29 15:42:26 -05:00
..
amd.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
aquantia.c
at803x.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
bcm-cygnus.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
bcm-phy-lib.c
bcm-phy-lib.h
bcm7xxx.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
bcm63xx.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
bcm87xx.c
broadcom.c	net: phy: broadcom: Add entry for 5395 switch PHYs	2017-12-15 15:41:13 -05:00
cicada.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
cortina.c	net: phy: cortina: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE	2017-11-24 01:23:49 +09:00
davicom.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
dp83640.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
dp83640_reg.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
dp83822.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
dp83848.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
dp83867.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
et1011c.c
fixed_phy.c
icplus.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
intel-xway.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
Kconfig	net: phy: leds: Add support for "link" trigger	2017-11-08 10:24:14 +09:00
lxt.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
Makefile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
marvell.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
marvell10g.c	net: phy: marvell10g: remove XGMII as an option for 88x3310	2017-12-13 15:03:15 -05:00
mdio-bcm-iproc.c
mdio-bcm-unimac.c
mdio-bitbang.c
mdio-boardinfo.c
mdio-boardinfo.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mdio-cavium.c
mdio-cavium.h
mdio-gpio.c
mdio-hisi-femac.c
mdio-i2c.c
mdio-i2c.h
mdio-moxart.c
mdio-mux-bcm-iproc.c
mdio-mux-gpio.c
mdio-mux-mmioreg.c
mdio-mux.c
mdio-octeon.c
mdio-sun4i.c
mdio-thunder.c
mdio-xgene.c	net: phy: xgene: disable clk on error paths	2017-12-18 15:09:42 -05:00
mdio-xgene.h
mdio_bus.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
mdio_device.c	phylib: rename reset-(post-)delay-us to reset-(de)assert-us	2017-12-27 11:06:50 -05:00
meson-gxl.c	net: phy: meson-gxl: join the authors	2017-12-18 13:24:56 -05:00
micrel.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
microchip.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
mscc.c
national.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
phy-c45.c
phy-core.c
phy.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
phy_device.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-16 22:11:55 -05:00
phy_led_triggers.c	net: phy: leds: Add support for "link" trigger	2017-11-08 10:24:14 +09:00
phylink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
qsemi.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
realtek.c	net: phy: realtek: add utility functions to read/write page addresses	2017-12-03 09:38:17 -05:00
rockchip.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
sfp-bus.c	sfp: convert to fwnode	2017-12-05 11:16:19 -05:00
sfp.c	sfp: fix EEPROM reading in the case of non-SFF8472 SFPs	2017-12-18 14:57:48 -05:00
sfp.h
smsc.c	net: phy: smsc: LAN8710/20: add PHY_RST_AFTER_CLK_EN flag	2017-12-13 11:22:54 -05:00
spi_ks8995.c
ste10Xp.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
swphy.c
swphy.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
teranetics.c
uPD60620.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
vitesse.c	net: phy: remove generic settings for callbacks config_aneg and read_status from drivers	2017-12-01 15:42:21 -05:00
xilinx_gmii2rgmii.c