David S. Miller d247b6ab3c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/Makefile net/ipv6/sysctl_net_ipv6.c Two ipv6_table_template[] additions overlap, so the index of the ipv6_table[x] assignments needed to be adjusted. In the drivers/net/Makefile case, we've gotten rid of the garbage whereby we had to list every single USB networking driver in the top-level Makefile, there is just one "USB_NETWORKING" that guards everything. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-08-05 18:46:26 -07:00
..
amd-xgbe-phy.c	amd-xgbe-phy: Allow more time for Rx/Tx to become ready	2014-08-02 19:29:53 -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: 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	net/phy/bcm87xx: Add MODULE_LICENSE("GPL") to GPL driver	2012-09-22 15:33:46 -04:00
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	ptp: Added a clock driver for the National Semiconductor PHYTER.	2011-05-23 13:10:23 -07:00
dp83640.c	dp83640: Fix receive timestamp race condition	2014-07-22 19:56:18 -07:00
et1011c.c	net/phy: fix many "defined but unused" warnings	2010-10-05 00:34:29 -07:00
fixed.c	net: phy: extend fixed driver with fixed_phy_register()	2014-05-16 17:18:49 -04:00
icplus.c	net: phy: icplus: fix checkpath error	2013-12-18 00:49:02 -05:00
Kconfig	amd-xgbe: Configuration and build support	2014-06-05 15:26:51 -07:00
lxt.c	net: phy: lxt: fix checkpath errors	2013-12-18 00:49:02 -05:00
Makefile	amd-xgbe: Configuration and build support	2014-06-05 15:26:51 -07:00
marvell.c	net: phy: marvell: provide genphy suspend/resume	2013-12-17 14:42:44 -05:00
mdio_bus.c	Revert "net: phy: Set the driver when registering an MDIO bus device"	2014-08-05 16:41:52 -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: libphy: Add stubs to hook IEEE MMD Register reads and writes	2014-07-30 20:00:21 -07:00
national.c	phy: Use pr_<level>	2012-06-11 16:58:24 -07:00
phy_device.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-30 13:25:49 -07:00
phy.c	net: libphy: Add phy specific function to access mmd phy registers	2014-07-30 20:00:21 -07:00
qsemi.c	net/phy: fix many "defined but unused" warnings	2010-10-05 00:34:29 -07:00
realtek.c	net: phy: realtek: register/unregister multiple drivers properly	2014-06-11 15:17:27 -07:00
smsc.c	net/phy: Remove return value for void function	2014-04-23 15:28:05 -04: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