UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/net/phy
History
David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/renesas/ravb_main.c
	kernel/bpf/syscall.c
	net/ipv4/ipmr.c

All three conflicts were cases of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2015-12-03 21:09:12 -05:00
..
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-24 06:54:12 -07:00
Makefile Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-24 06:54:12 -07:00
amd.c net: phy: replace phy_driver_register calls 2014-11-12 13:52:53 -05:00
aquantia.c net: phy: aquantia/teranetics: Convert to use module_phy_driver macro 2015-10-14 19:01:16 -07:00
at803x.c net: phy: at803x: support interrupt on 8030 and 8035 2015-11-16 14:18:40 -05:00
bcm-cygnus.c net: phy: Broadcom Cygnus internal Etherent PHY driver 2015-10-08 04:45:52 -07:00
bcm-phy-lib.c net: phy: bcm-phy-lib: Fix module license issue 2015-10-18 19:35:10 -07:00
bcm-phy-lib.h net: phy: Add Broadcom phy library for common interfaces 2015-10-08 04:45:46 -07:00
bcm7xxx.c net: phy: bcm7xxx: Add entry for Broadcom BCM7435 2015-11-25 11:35:14 -05:00
bcm63xx.c net: phy: Add Broadcom phy library for common interfaces 2015-10-08 04:45:46 -07:00
bcm87xx.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
broadcom.c broadcom: fix PHY_ID_BCM5481 entry in the id table 2015-11-23 23:29:27 -05:00
cicada.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
davicom.c net: phy: davicom: add IDs for DM9161B and C variants 2015-06-11 00:24:53 -07:00
dp83640.c dp83640: Only wait for timestamps for packets with timestamping enabled. 2015-11-03 11:08:22 -05:00
dp83640_reg.h ptp: Added a clock driver for the National Semiconductor PHYTER. 2011-05-23 13:10:23 -07:00
dp83848.c net: phy: dp83848: Add TI DP83848 Ethernet PHY 2015-10-22 06:37:19 -07:00
dp83867.c net: phy: dp83867: fix simple_return.cocci warnings 2015-07-27 00:59:16 -07:00
et1011c.c net: phy: replace phy_driver_register calls 2014-11-12 13:52:53 -05:00
fixed_phy.c phy: fixed-phy: properly validate phy in fixed_phy_update_state() 2015-09-24 23:04:53 -07:00
icplus.c net: phy: Utilize phy_interface_is_rgmii 2015-05-27 00:27:35 -04:00
lxt.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
marvell.c phy: marvell: Add support for 88E1540 PHY 2015-11-17 15:25:43 -05:00
mdio-bcm-iproc.c net: phy: Broadcom iProc MDIO bus driver 2015-10-08 04:44:46 -07:00
mdio-bcm-unimac.c net: phy: mdio-bcm-unimac: Fix module autoload for OF platform driver 2015-09-21 16:11:20 -07:00
mdio-bitbang.c net: phy: mdio-gpio: Handle phy_ignore_ta_mask 2015-05-14 13:40:55 -04:00
mdio-gpio.c net: mdio-gpio: move platform data header 2015-10-21 19:50:44 -07:00
mdio-moxart.c drivers/net: delete non-required instances of include <linux/init.h> 2014-01-16 11:53:26 -08:00
mdio-mux-gpio.c gpiolib: rename gpiod_set_array to gpiod_set_array_value 2015-06-01 15:10:09 +02:00
mdio-mux-mmioreg.c net: phy: mdio: add missing of_node_put 2015-10-26 22:08:12 -07:00
mdio-mux.c netdev/phy: add missing of_node_put 2015-10-26 22:08:11 -07:00
mdio-octeon.c net: mdio-octeon: Fix octeon_mdiobus_probe function for return values 2015-07-29 17:17:44 -07:00
mdio-sun4i.c net: sun4i: remove empty MDIO bus reset function 2014-03-28 01:38:02 -04:00
mdio_bus.c net: phy: Add nested variants of mdiobus read/write 2015-10-23 05:57:43 -07:00
micrel.c net/phy: micrel: Add workaround for bad autoneg 2015-10-23 02:57:26 -07:00
microchip.c add microchip LAN88xx phy driver 2015-09-09 17:19:14 -07:00
national.c net: phy: replace phy_driver_register calls 2014-11-12 13:52:53 -05:00
phy.c net: phy: reset only targeted phy 2015-12-03 15:26:13 -05:00
phy_device.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-11-03 13:41:45 -05:00
qsemi.c net: phy: replace phy_driver_register calls 2014-11-12 13:52:53 -05:00
realtek.c net: phy: add RealTek RTL8211DN phy id 2015-08-09 22:52:15 -07:00
smsc.c net: phy: smsc: disable energy detect mode 2015-10-21 06:41:44 -07:00
spi_ks8995.c spi: Drop owner assignment from spi_drivers 2015-10-28 10:30:17 +09:00
ste10Xp.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
teranetics.c net: phy: aquantia/teranetics: Convert to use module_phy_driver macro 2015-10-14 19:01:16 -07:00
vitesse.c net: phy: vitesse: add support for VSC8601 2015-11-16 14:18:40 -05:00