linux/drivers/net/phy
David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-08-26 16:37:08 -04:00
..
amd.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
at803x.c drivers: net: phy: at803x: Add missing mdio device id 2013-07-11 11:54:19 -07: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 phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
cicada.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
davicom.c net/phy/davicom: add irq functions to DM9161E and DM9161A 2012-11-14 18:51:02 -05:00
dp83640.c net/phy: Add interrupt support for dp83640 phy. 2012-12-05 16:01:28 -05:00
dp83640_reg.h
et1011c.c
fixed.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
icplus.c net: phy: icplus: fix broken INTR pin settings 2013-01-28 00:08:22 -05:00
Kconfig Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2013-07-13 14:52:21 -07:00
lxt.c Supject: phy: make local function static 2013-03-09 16:09:17 -05:00
Makefile net: Add MDIO bus driver for the Allwinner EMAC 2013-05-31 17:23:07 -07:00
marvell.c phy: Add Marvell 88E1510 phy ID 2013-05-31 00:48:22 -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: Use module_platform_driver() 2013-03-20 13:25:37 -04:00
mdio-mux-gpio.c gpio: Make of_count_named_gpios() use new of_count_phandle_with_args() 2013-02-13 10:11:53 +00:00
mdio-mux-mmioreg.c net: phy: mdio: add missing __iomem annotation 2013-08-07 16:59:10 -07:00
mdio-mux.c netdev/phy: skip disabled mdio-mux nodes 2012-08-20 02:16:00 -07:00
mdio-octeon.c net: phy: mdio-octeon: use platform_set_drvdata() 2013-08-21 20:51:11 -07:00
mdio-sun4i.c net: sun4i: fix timeout check 2013-07-24 17:04:20 -07:00
mdio_bus.c driver-core: constify data for class_find_device() 2013-02-06 12:18:56 -08:00
micrel.c net/phy: micrel: Add OF configuration support for ksz9021 2013-08-21 00:03:38 -07:00
national.c phy: Use pr_<level> 2012-06-11 16:58:24 -07:00
phy.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-07-09 18:24:39 -07:00
phy_device.c phy: allow drivers to flag a PHY device as internal 2013-05-27 22:42:50 -07:00
qsemi.c
realtek.c net: phy: rtl8211: fix interrupt on status link change 2013-08-20 17:10:58 -07:00
smsc.c net: phy: smsc: Fix config_init typo 2012-12-07 14:26:15 -05:00
spi_ks8995.c net/phy: Use module_spi_driver in spi_ks8995.c 2013-05-27 23:24:29 -07:00
ste10Xp.c phylib: Support registering a bunch of drivers 2012-07-09 00:10:56 -07:00
vitesse.c phy: Add Vitesse 8211 phy ID 2013-05-31 00:48:22 -07:00