Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 12:21:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
36583eb54d
linux/drivers/net/phy
History
David S. Miller 36583eb54d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/cadence/macb.c
	drivers/net/phy/phy.c
	include/linux/skbuff.h
	net/ipv4/tcp.c
	net/switchdev/switchdev.c

Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD}
renaming overlapping with net-next changes of various
sorts.

phy.c was a case of two changes, one adding a local
variable to a function whilst the second was removing
one.

tcp.c overlapped a deadlock fix with the addition of new tcp_info
statistic values.

macb.c involved the addition of two zyncq device entries.

skbuff.h involved adding back ipv4_daddr to nf_bridge_info
whilst net-next changes put two other existing members of
that struct into a union.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-23 01:22:35 -04:00
..
amd.c net: phy: replace phy_driver_register calls 2014-11-12 13:52:53 -05:00
at803x.c net: phy: at803x: simplify using devm_gpiod_get_optional and its 4th argument 2015-04-01 12:44:04 -04:00
bcm7xxx.c net: phy: bcm7xxx: add alternate id for 7439 2015-03-09 23:57:54 -04:00
bcm63xx.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
bcm87xx.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
broadcom.c net: phy: broadcom: Add BCM54616S phy entry 2015-04-08 15:28:13 -04:00
cicada.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
davicom.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
dp83640_reg.h
dp83640.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2015-04-15 09:00:47 -07:00
et1011c.c net: phy: replace phy_driver_register calls 2014-11-12 13:52:53 -05:00
fixed_phy.c add fixed_phy_update_state() - update state of fixed_phy 2015-04-03 15:08:20 -04:00
icplus.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
Kconfig amd-xgbe: Move the PHY support into amd-xgbe 2015-05-15 15:21:43 -04:00
lxt.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
Makefile amd-xgbe: Move the PHY support into amd-xgbe 2015-05-15 15:21:43 -04:00
marvell.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
mdio_bus.c net: phy: avoid suspending twice a PHY 2015-01-27 00:16:51 -08:00
mdio-bcm-unimac.c net: phy: constify of_device_id array 2015-03-17 15:00:23 -04:00
mdio-bitbang.c net: phy: mdio-gpio: Handle phy_ignore_ta_mask 2015-05-14 13:40:55 -04:00
mdio-gpio.c mdio-gpio: Propagate mii_bus.phy_ignore_ta_mask 2015-05-14 22:35:13 -04:00
mdio-moxart.c
mdio-mux-gpio.c mdio-mux-gpio: use new gpiod_get_array and gpiod_put_array functions 2015-04-27 13:35:40 -04:00
mdio-mux-mmioreg.c net: phy: constify of_device_id array 2015-03-17 15:00:23 -04:00
mdio-mux.c
mdio-octeon.c net: phy: constify of_device_id array 2015-03-17 15:00:23 -04:00
mdio-sun4i.c net: sun4i: remove empty MDIO bus reset function 2014-03-28 01:38:02 -04:00
micrel.c net: phy: micrel: Fix regression in kszphy_probe 2015-05-12 23:18:40 -04:00
national.c net: phy: replace phy_driver_register calls 2014-11-12 13:52:53 -05:00
phy_device.c net: phy: keep track of the PHY suspend state 2015-01-27 00:16:51 -08:00
phy.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-05-23 01:22:35 -04:00
qsemi.c net: phy: replace phy_driver_register calls 2014-11-12 13:52:53 -05:00
realtek.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
smsc.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
spi_ks8995.c net: phy: spi_ks8995: remove sysfs bin file by registered attribute 2014-11-04 17:18:45 -05:00
ste10Xp.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
vitesse.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00