David S. Miller df39e8ba56 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/ehea/ehea_main.c
	drivers/net/wireless/iwlwifi/Kconfig
	drivers/net/wireless/rt2x00/rt61pci.c
	net/ipv4/inet_timewait_sock.c
	net/ipv6/raw.c
	net/mac80211/ieee80211_sta.c

2008-04-14 02:30:23 -07:00

..

broadcom.c

phy/broadcom: add support for BCM5481 PHY

2008-03-26 00:19:56 -04:00

cicada.c

…

davicom.c

dm9161: add configuration for MII/RMII

2008-03-05 06:26:56 -05:00

fixed.c

net/phy/fixed.c: fix a use-after-free

2008-02-11 11:15:36 -05:00

icplus.c

phylib: add the ICPlus IP175C PHY driver

2007-07-08 22:16:38 -04:00

Kconfig

FIXED_PHY must depend on PHYLIB=y

2008-03-05 06:34:34 -05:00

lxt.c

…

Makefile

phylib: Add Realtek 821x eth PHY support

2008-02-03 04:28:42 -08:00

marvell.c

net: marvell.c fix sparse shadowed variable warning

2008-04-04 17:26:15 -04:00

mdio_bus.c

net/phy/mdio_bus.c: fix a check-after-use

2008-02-23 23:57:50 -05:00

mdio-bitbang.c

phy/bitbang: missing MODULE_LICENSE

2007-10-19 23:00:01 -04:00

phy_device.c

PHYLIB: Locking fixes for PHY I/O potentially sleeping

2008-02-03 04:28:41 -08:00

phy.c

PHYLIB: Locking fixes for PHY I/O potentially sleeping

2008-02-03 04:28:41 -08:00

qsemi.c

…

realtek.c

phylib: Add Realtek 821x eth PHY support

2008-02-03 04:28:42 -08:00

smsc.c

…

vitesse.c

Fix error checking in Vitesse IRQ config

2007-07-24 16:28:41 -04:00