linux/drivers/net/phy
David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-01 22:51:30 -07:00
..
amd.c net: phy: replace phy_driver_register calls 2014-11-12 13:52:53 -05:00
at803x.c net: phy: at803x: simplify using devm_gpiod_get_optional and its 4th argument 2015-04-01 12:44:04 -04:00
bcm7xxx.c net: phy: bcm7xxx: Fix 7425 PHY ID and flags 2015-05-25 00:16:07 -04: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: broadcom: Add BCM54616S phy entry 2015-04-08 15:28:13 -04: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.c net: dp83640: fix improper double spin locking. 2015-05-25 18:21:59 -04:00
dp83640_reg.h
et1011c.c net: phy: replace phy_driver_register calls 2014-11-12 13:52:53 -05:00
fixed_phy.c add fixed_phy_update_state() - update state of fixed_phy 2015-04-03 15:08:20 -04:00
icplus.c net: phy: Utilize phy_interface_is_rgmii 2015-05-27 00:27:35 -04:00
Kconfig amd-xgbe: Move the PHY support into amd-xgbe 2015-05-15 15:21:43 -04:00
lxt.c net: phy: replace phy_drivers_register calls 2014-11-12 13:52:53 -05:00
Makefile amd-xgbe: Move the PHY support into amd-xgbe 2015-05-15 15:21:43 -04:00
marvell.c net: phy: Utilize phy_interface_is_rgmii 2015-05-27 00:27:35 -04:00
mdio-bcm-unimac.c net: phy: constify of_device_id array 2015-03-17 15:00:23 -04:00
mdio-bitbang.c net: phy: mdio-gpio: Handle phy_ignore_ta_mask 2015-05-14 13:40:55 -04:00
mdio-gpio.c mdio-gpio: Propagate mii_bus.phy_ignore_ta_mask 2015-05-14 22:35:13 -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 mdio-mux-gpio: use new gpiod_get_array and gpiod_put_array functions 2015-04-27 13:35:40 -04:00
mdio-mux-mmioreg.c net: phy: constify of_device_id array 2015-03-17 15:00:23 -04:00
mdio-mux.c
mdio-octeon.c net: phy: constify of_device_id array 2015-03-17 15:00:23 -04:00
mdio-sun4i.c net: sun4i: remove empty MDIO bus reset function 2014-03-28 01:38:02 -04:00
mdio_bus.c net: phy: avoid suspending twice a PHY 2015-01-27 00:16:51 -08:00
micrel.c net: phy: micrel: Fix regression in kszphy_probe 2015-05-12 23:18:40 -04:00
national.c net: phy: replace phy_driver_register calls 2014-11-12 13:52:53 -05:00
phy.c net: phy: Utilize phy_interface_is_rgmii 2015-05-27 00:27:35 -04:00
phy_device.c net: phy: keep track of the PHY suspend state 2015-01-27 00:16:51 -08: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