David S. Miller 9f6ec8d697 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_vs_core.c		2011-06-20 22:29:08 -07:00
..
Kconfig	phylib: Allow BCM63XX PHY to be selected only on BCM63XX.	2011-06-16 23:45:01 -04:00
Makefile	ptp: Added a clock driver for the National Semiconductor PHYTER.	2011-05-23 13:10:23 -07:00
bcm63xx.c	…
broadcom.c	…
cicada.c	…
davicom.c	…
dp83640.c	dp83640: drop PHY status frames in the driver.	2011-06-16 23:48:12 -04:00
dp83640_reg.h	ptp: Added a clock driver for the National Semiconductor PHYTER.	2011-05-23 13:10:23 -07:00
et1011c.c	…
fixed.c	…
icplus.c	net: icplus: remove unnecessary code	2011-06-17 00:03:04 -04:00
lxt.c	…
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.c	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
mdio-octeon.c	…
mdio_bus.c	…
micrel.c	phy/micrel: add ability to support 50MHz RMII clock on KZS8051RNL	2011-02-14 17:38:30 -08:00
national.c	…
phy.c	ethtool: cosmetic: Use ethtool ethtool_cmd_speed API	2011-04-29 14:03:01 -07:00
phy_device.c	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
qsemi.c	…
realtek.c	…
smsc.c	…
ste10Xp.c	…
vitesse.c	…