David S. Miller 4366004d77 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/intel/igb/e1000_mac.c
	net/core/filter.c

Both conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-04-24 13:19:00 -04:00

..

amd.c

…

at803x.c

net/phy: Remove return value for void function

2014-04-23 15:28:05 -04:00

bcm7xxx.c

net: phy: bcm7xxx: properly clear AFE_RX_LP_COUNTER

2014-03-26 16:19:24 -04:00

bcm63xx.c

phy: bcm63xx: report Broadcom BCM63xx PHYs as internal

2013-05-27 22:42:50 -07:00

bcm87xx.c

…

broadcom.c

net: phy: broadcom: extract register definitions

2014-02-14 00:27:58 -05:00

cicada.c

net: phy: cicada: fix checkpath errors

2013-12-18 00:49:01 -05:00

davicom.c

net: phy: davicom: fix checkpath errors

2013-12-18 00:49:01 -05:00

dp83640_reg.h

…

dp83640.c

net: ptp: move PTP classifier in its own file

2014-04-01 16:43:18 -04:00

et1011c.c

…

fixed.c

…

icplus.c

net: phy: icplus: fix checkpath error

2013-12-18 00:49:02 -05:00

Kconfig

net: phy: add Broadcom BCM7xxx internal PHY driver

2014-02-14 00:27:58 -05:00

lxt.c

net: phy: lxt: fix checkpath errors

2013-12-18 00:49:02 -05:00

Makefile

net: phy: add Broadcom BCM7xxx internal PHY driver

2014-02-14 00:27:58 -05:00

marvell.c

net: phy: marvell: provide genphy suspend/resume

2013-12-17 14:42:44 -05:00

mdio_bus.c

net: phy: expose phydev->has_fixups to sysfs

2014-02-12 19:08:49 -05:00

mdio-bitbang.c

…

mdio-gpio.c

net: mdio-gpio: Add support for separate MDI and MDO gpio pins

2014-04-16 15:09:51 -04: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

drivers/net: delete non-required instances of include <linux/init.h>

2014-01-16 11:53:26 -08:00

mdio-mux-mmioreg.c

drivers/net: delete non-required instances of include <linux/init.h>

2014-01-16 11:53:26 -08:00

mdio-mux.c

…

mdio-octeon.c

drivers/net: delete non-required instances of include <linux/init.h>

2014-01-16 11:53:26 -08: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 bugged test on device tree loading for ksz9021

2014-04-23 14:58:58 -04:00

national.c

…

phy_device.c

net: phy: export genphy_config_init()

2014-04-20 18:18:54 -04:00

phy.c

net phylib: Remove unnecessary condition check in phy

2014-04-09 13:03:53 -04:00

qsemi.c

…

realtek.c

PHY: Add RTL8201CP phy_driver to realtek

2013-11-11 14:05:03 -05:00

smsc.c

net/phy: Remove return value for void function

2014-04-23 15:28:05 -04:00

spi_ks8995.c

net: Micrel KSZ8864RMN 4-port managed switch support

2014-04-03 16:15:29 -04:00

ste10Xp.c

…

vitesse.c

net/phy: Remove return value for void function

2014-04-23 15:28:05 -04:00