David S. Miller 278554bd65 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/net/wireless/ath/ar9170/usb.c drivers/scsi/iscsi_tcp.c net/ipv4/ipmr.c		2010-05-12 00:05:35 -07:00
..
bcm63xx.c	PHY: fix typo in bcm63xx PHY driver table	2010-04-13 03:29:36 -07:00
broadcom.c	phylib: Add module table to all existing phy drivers	2010-04-02 14:30:40 -07:00
cicada.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
davicom.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
et1011c.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
fixed.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
icplus.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
Kconfig	drivers/net/phy: micrel phy driver	2010-05-03 15:43:26 -07:00
lxt.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
Makefile	drivers/net/phy: micrel phy driver	2010-05-03 15:43:26 -07:00
marvell.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
mdio_bus.c	NET: Support clause 45 MDIO commands at the MDIO bus level	2010-03-16 21:23:42 -07:00
mdio-bitbang.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
mdio-gpio.c	net: fix mdio section mismatch warning	2009-11-17 04:04:40 -08:00
mdio-octeon.c	NET: mdio-octeon: Enable the hardware before using it.	2010-04-30 20:52:52 +01:00
micrel.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-05-12 00:05:35 -07:00
national.c	phylib: Add module table to all existing phy drivers	2010-04-02 14:30:40 -07:00
phy_device.c	phylib: Support phy module autoloading	2010-04-02 14:30:39 -07:00
phy.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
qsemi.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
realtek.c	phylib: Add module table to all existing phy drivers	2010-04-02 14:30:40 -07:00
smsc.c	phylib: Add module table to all existing phy drivers	2010-04-02 14:30:40 -07:00
ste10Xp.c	phylib: Add module table to all existing phy drivers	2010-04-02 14:30:40 -07:00
vitesse.c	phylib: Add module table to all existing phy drivers	2010-04-02 14:30:40 -07:00