David S. Miller 076ce44825 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/chelsio/cxgb4vf/sge.c drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c sge.c was overlapping two changes, one to use the new __dev_alloc_page() in net-next, and one to use s->fl_pg_order in net. ixgbe_phy.c was a set of overlapping whitespace changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-14 01:01:12 -05:00
..
amd-xgbe-phy.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -05:00
amd.c	net: phy: replace phy_driver_register calls	2014-11-12 13:52:53 -05:00
at803x.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -05:00
bcm7xxx.c	net: phy: bcm7xxx: add workaround for PHY revision E0 and F0	2014-11-12 13:58:07 -05:00
bcm63xx.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -05:00
bcm87xx.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -05:00
broadcom.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -05:00
cicada.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -05:00
davicom.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -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	net: ptp: fix time stamp matching logic for VLAN packets.	2014-11-12 15:06:17 -05:00
et1011c.c	net: phy: replace phy_driver_register calls	2014-11-12 13:52:53 -05:00
fixed.c	net: phy: adjust fixed_phy_register() return value	2014-10-07 13:06:45 -04:00
icplus.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -05:00
Kconfig	amd-xgbe-phy: Let AMD_XGBE_PHY depend on HAS_IOMEM	2014-11-05 21:50:13 -05:00
lxt.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -05:00
Makefile	net: phy: add generic UniMAC MDIO bus driver	2014-08-27 22:59:39 -07:00
marvell.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -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: enable led-mode for KSZ8081/KSZ8091	2014-11-12 13:55:37 -05:00
national.c	net: phy: replace phy_driver_register calls	2014-11-12 13:52:53 -05:00
phy_device.c	phylib: use MDIO_DEVS[12]	2014-08-22 21:16:51 -07:00
phy.c	net: phy: Correctly handle MII ioctl which changes autonegotiation.	2014-11-11 16:21:26 -05:00
qsemi.c	net: phy: replace phy_driver_register calls	2014-11-12 13:52:53 -05:00
realtek.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -05:00
smsc.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -05:00
spi_ks8995.c	net: phy: spi_ks8995: remove sysfs bin file by registered attribute	2014-11-04 17:18:45 -05:00
ste10Xp.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -05:00
vitesse.c	net: phy: replace phy_drivers_register calls	2014-11-12 13:52:53 -05:00