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
aquantia.c	net: phy: aquantia/teranetics: Convert to use module_phy_driver macro	2015-10-14 19:01:16 -07:00
at803x.c
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: 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
broadcom.c	net: phy: Add Broadcom phy library for common interfaces	2015-10-08 04:45:46 -07:00
cicada.c
davicom.c
dp83640.c
dp83640_reg.h
dp83848.c	net: phy: dp83848: Add TI DP83848 Ethernet PHY	2015-10-22 06:37:19 -07:00
dp83867.c
et1011c.c
fixed_phy.c	phy: fixed-phy: properly validate phy in fixed_phy_update_state()	2015-09-24 23:04:53 -07:00
icplus.c
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00
lxt.c
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-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
mdio-gpio.c	net: mdio-gpio: move platform data header	2015-10-21 19:50:44 -07:00
mdio-moxart.c
mdio-mux-gpio.c
mdio-mux-mmioreg.c
mdio-mux.c	phy: fix of_mdio_find_bus() device refcount leak	2015-09-24 23:04:52 -07:00
mdio-octeon.c
mdio-sun4i.c
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
phy.c	phylib: simplify NULL checks	2015-08-28 14:15:25 -07:00
phy_device.c	phylib: Add phy_set_max_speed helper	2015-10-03 05:05:18 -07:00
qsemi.c
realtek.c
smsc.c	net: phy: smsc: disable energy detect mode	2015-10-21 06:41:44 -07:00
spi_ks8995.c
ste10Xp.c
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