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
..
21142.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
de4x5.c	[PATCH] Replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in tulip driver	2006-11-13 14:44:56 +11:00
de4x5.h	[netdrvr] trim trailing whitespace: 8139*.c, epic100, forcedeth, tulip/*	2006-05-26 21:39:03 -04:00
de2104x.c	[PATCH] kmemdup() cleanup in drivers/net	2006-12-02 00:12:01 -05:00
dmfe.c	drivers/net/tulip/dmfe: support basic carrier detection	2006-12-02 00:16:37 -05:00
eeprom.c	[PATCH] Change tulip maintainer	2006-09-11 09:05:37 -04:00
interrupt.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
Kconfig	[netdrvr] add 'uli526x' driver (a tulip clone)	2005-07-29 15:33:58 -04:00
Makefile	[netdrvr] add 'uli526x' driver (a tulip clone)	2005-07-29 15:33:58 -04:00
media.c	[PATCH] Change tulip maintainer	2006-09-11 09:05:37 -04:00
pnic.c	[PATCH] Change tulip maintainer	2006-09-11 09:05:37 -04:00
pnic2.c	[PATCH] Change tulip maintainer	2006-09-11 09:05:37 -04:00
timer.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
tulip.h	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
tulip_core.c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
uli526x.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
winbond-840.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
xircom_cb.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
xircom_tulip_cb.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00