David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-05 20:32:02 -05:00
..
amd.c
at803x.c	net: phy: at803x: add suspend/resume callbacks	2013-09-27 17:28:32 -04:00
bcm7xxx.c	net: phy: add Broadcom BCM7xxx internal PHY driver	2014-02-14 00:27:58 -05: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:phy:dp83640: Move all HW initialization to dp83640_config_init	2014-02-13 18:52:22 -05: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	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08: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: phy: sunxi: Add new compatibles	2014-02-06 19:46:54 -08:00
micrel.c	phy: micrel: add of configuration for LED mode	2014-02-26 17:00:07 -05:00
national.c
phy_device.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
phy.c	net: phy: update port type for MoCA PHYs	2014-02-14 00:27:57 -05:00
qsemi.c
realtek.c	PHY: Add RTL8201CP phy_driver to realtek	2013-11-11 14:05:03 -05:00
smsc.c
spi_ks8995.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
ste10Xp.c
vitesse.c	phy: Add Vitesse 8514 phy ID	2013-11-28 18:30:54 -05:00