Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 21:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
1b3433a942
linux/drivers/net/phy
History
David S. Miller ba3e2084f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/ipv6/xfrm6_output.c
	net/openvswitch/flow_netlink.c
	net/openvswitch/vport-gre.c
	net/openvswitch/vport-vxlan.c
	net/openvswitch/vport.c
	net/openvswitch/vport.h

The openvswitch conflicts were overlapping changes.  One was
the egress tunnel info fix in 'net' and the other was the
vport ->send() op simplification in 'net-next'.

The xfrm6_output.c conflicts was also a simplification
overlapping a bug fix.

Signed-off-by: David S. Miller <davem@davemloft.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: simplify using devm_gpiod_get_optional and its 4th argument 2015-04-01 12:44:04 -04:00
bcm7xxx.c net: phy: bcm7xxx: Modified to use global core register defines 2015-10-08 04:45:53 -07: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
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
broadcom.c net: phy: Add Broadcom phy library for common interfaces 2015-10-08 04:45:46 -07: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_reg.h
dp83640.c dp83640: only report generic filters in ts_info 2015-07-17 19:59:06 -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
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-24 06:54:12 -07:00
lxt.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
Makefile Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-24 06:54:12 -07:00
marvell.c phy: marvell: add link partner advertised modes 2015-09-25 12:23:47 -07:00
mdio_bus.c net: phy: Add nested variants of mdiobus read/write 2015-10-23 05:57:43 -07: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: constify of_device_id array 2015-03-17 15:00:23 -04:00
mdio-mux.c phy: fix of_mdio_find_bus() device refcount leak 2015-09-24 23:04:52 -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
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_device.c phylib: Add phy_set_max_speed helper 2015-10-03 05:05:18 -07:00
phy.c phylib: simplify NULL checks 2015-08-28 14:15:25 -07: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 net: phy: spi_ks8995: clean up ks8995_registers_read/write 2015-07-30 14:16:45 -07: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 Revert "net/phy: Add Vitesse 8641 phy ID" 2015-09-20 22:29:34 -07:00