alistair23-linux/drivers/net/phy
David Howells 9db7372445 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 17:01:28 +00:00
..
broadcom.c [PATCH] 2.6.18: sb1250-mac: Broadcom PHY support 2006-12-02 00:11:54 -05:00
cicada.c
davicom.c
fixed.c [PATCH] Slight refactor of interrupt mapping for FSL parts 2006-11-13 14:48:52 +11:00
Kconfig [PATCH] 2.6.18: sb1250-mac: Broadcom PHY support 2006-12-02 00:11:54 -05:00
lxt.c
Makefile [PATCH] 2.6.18: sb1250-mac: Broadcom PHY support 2006-12-02 00:11:54 -05:00
marvell.c Revert "[PATCH] Add support for Marvell 88e1111S and 88e1145" 2006-12-02 00:12:04 -05:00
mdio_bus.c
phy.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
phy_device.c [PATCH] PHY: Add support for configuring the PHY connection interface 2006-12-02 00:33:11 -05:00
qsemi.c
smsc.c
vitesse.c