alistair23-linux/drivers/net/phy
David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/sfc/rx.c

Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-02-26 21:55:51 -05:00
..
bcm63xx.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
broadcom.c drivers/net: Remove boolean comparisons to true/false 2012-02-13 00:47:40 -05:00
cicada.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
davicom.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
dp83640.c dp83640: Fix NOHZ local_softirq_pending 08 warning 2012-01-12 15:26:01 -08:00
dp83640_reg.h ptp: Added a clock driver for the National Semiconductor PHYTER. 2011-05-23 13:10:23 -07:00
et1011c.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
fixed.c phy/fixed: use an unique MDIO bus name. 2012-01-10 16:35:02 -08:00
icplus.c phy: IC+101G and PHY_HAS_INTERRUPT flag 2012-02-23 17:14:26 -05:00
Kconfig phy: Micrel KS8995MA 5-ports 10/100 managed Ethernet switch support added 2011-12-19 16:30:40 -05:00
lxt.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
Makefile phy: Micrel KS8995MA 5-ports 10/100 managed Ethernet switch support added 2011-12-19 16:30:40 -05:00
marvell.c of/phylib: Use device tree properties to initialize Marvell PHYs. 2010-11-22 08:34:23 -08:00
mdio-bitbang.c mdio-gpio: Add reset functionality to mdio-gpio driver(v2). 2011-11-15 16:56:17 -05:00
mdio-gpio.c mdio-gpio: use an unique MDIO bus name. 2012-01-10 16:35:02 -08:00
mdio-octeon.c mdio-octeon: use an unique MDIO bus name. 2012-01-10 16:35:02 -08:00
mdio_bus.c kernel-doc: fix new warning in net/phy/mdio_bus.c 2012-01-22 15:08:45 -05:00
micrel.c phy/micrel: add ability to support 50MHz RMII clock on KZS8051RNL 2011-02-14 17:38:30 -08:00
national.c net/phy: fix DP83865 phy interrupt handler 2011-08-26 12:48:24 -04:00
phy.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
phy_device.c net: Change mii to ethtool advertisement function names 2011-11-21 15:27:19 -05:00
qsemi.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
realtek.c drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
smsc.c net: phy: smsc: Move SMSC PHY constants to <linux/smscphy.h> 2012-01-03 20:23:18 -05:00
spi_ks8995.c phy: Micrel KS8995MA 5-ports 10/100 managed Ethernet switch support added 2011-12-19 16:30:40 -05:00
ste10Xp.c net/phy: fix many "defined but unused" warnings 2010-10-05 00:34:29 -07:00
vitesse.c phylib: Modify Vitesse RGMII skew settings 2011-10-19 15:59:45 -04:00