David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
amd-xgbe-phy.c	amd-xgbe-phy: Fix build break for missing declaration	2014-09-07 11:21:31 -07:00
amd.c	phylib: Support registering a bunch of drivers	2012-07-09 00:10:56 -07:00
at803x.c	net: phy: at803x: fix coccinelle warnings	2014-06-22 17:16:02 -07:00
bcm7xxx.c	net: phy: bcm7xxx: utilize PHY revision in config_init	2014-09-19 16:27:07 -04:00
bcm63xx.c	phy: bcm63xx: report Broadcom BCM63xx PHYs as internal	2013-05-27 22:42:50 -07:00
bcm87xx.c	net/phy/bcm87xx: Add MODULE_LICENSE("GPL") to GPL driver	2012-09-22 15:33:46 -04:00
broadcom.c	net: phy: broadcom: move shadow 0x1C register accessors to brcmphy.h	2014-08-23 11:38:53 -07: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	dp83640: Make use of skb_queue_purge instead of reimplementing the code	2014-09-08 14:24:35 -07:00
et1011c.c
fixed.c	net: phy: fixed: return an error for Clause 45 over 22 reads	2014-08-23 11:39:09 -07:00
icplus.c	net: phy: icplus: fix checkpath error	2013-12-18 00:49:02 -05:00
Kconfig	net: phy: mdio-sun4i: don't select REGULATOR	2014-09-07 16:12:03 -07:00
lxt.c	net: phy: lxt: fix checkpath errors	2013-12-18 00:49:02 -05:00
Makefile	net: phy: add generic UniMAC MDIO bus driver	2014-08-27 22:59:39 -07:00
marvell.c	net: phy: marvell: provide genphy suspend/resume	2013-12-17 14:42:44 -05:00
mdio_bus.c	net: phy: properly report internal PHYs through sysfs	2014-08-29 20:17:53 -07:00
mdio-bcm-unimac.c	net: phy: mdio-bcm-unimac: NULL-terminate unimac_mdio_ids	2014-09-01 20:41:45 -07:00
mdio-bitbang.c	Revert "drivers/net/phy/mdio-bitbang.c: Call mdiobus_unregister before mdiobus_free"	2012-11-14 22:32:15 -05:00
mdio-gpio.c	net: mdio-gpio: warn about missing bus alias id	2014-05-09 15:51:19 -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	netdev/phy: skip disabled mdio-mux nodes	2012-08-20 02:16:00 -07:00
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: Disable asymmetric pause for KSZ9031	2014-09-15 14:24:10 -04:00
national.c	phy: Use pr_<level>	2012-06-11 16:58:24 -07:00
phy_device.c	phylib: use MDIO_DEVS[12]	2014-08-22 21:16:51 -07:00
phy.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-09-07 21:41:53 -07:00
qsemi.c
realtek.c	net: phy: realtek: register/unregister multiple drivers properly	2014-06-11 15:17:27 -07:00
smsc.c	net: phy: smsc: move smsc_phy_config_init reset part in a soft_reset function	2014-08-16 20:15:54 -07:00
spi_ks8995.c	net: phy: spi_ks8995: Introduce the use of devm_kzalloc	2014-08-04 12:55:23 -07:00
ste10Xp.c	phylib: Support registering a bunch of drivers	2012-07-09 00:10:56 -07:00
vitesse.c	net/phy: Remove return value for void function	2014-04-23 15:28:05 -04:00