Linus Torvalds 60e233172e [net] Gracefully handle shared e1000/1000e driver PCI ID's ... Both the old e1000 driver and the new e1000e driver can drive some PCI-Express e1000 cards, and we should avoid ambiguity about which driver will pick up the support for those cards when both drivers are enabled. This solves the problem by having the old driver support those cards if the new driver isn't configured, but otherwise ceding support for PCI Express versions of the e1000 chipset to the newer driver. Thus allowing both legacy configurations where only the old driver is active (and handles all chips it knows about) and the new configuration with the new driver handling the more modern PCIE variants. Acked-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2008-01-31 00:30:15 +11:00
..
acorn/char
acpi
amba
ata	libata: Change "write_data" to "rw" for some function documentations	2008-01-29 08:48:17 +11:00
atm	[ATM]: [he] fixing compilation when you define USE_RBPS_POOL/USE_RBPL_POOL	2008-01-28 15:00:15 -08:00
auxdisplay
base	convert drivers/base/power/Makefile to ccflags	2008-01-28 23:14:35 +01:00
block	cciss: fix bug in overriding ->data_len before completion	2008-01-29 21:55:18 +01:00
bluetooth
cdrom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2008-01-29 08:52:50 +11:00
char
clocksource
connector	[NETNS]: Consolidate kernel netlink socket destruction.	2008-01-28 15:08:07 -08:00
cpufreq
cpuidle
crypto	[S390] crypto: move s390 Kconfig options.	2008-01-26 14:11:17 +01:00
dca
dio
dma
edac
eisa
firewire
firmware
hid	HID: ADS/Tech Radio si470x needs blacklist entry	2008-01-28 14:51:23 +01:00
hwmon
i2c	Merge branch 'orion' into devel	2008-01-28 13:21:30 +00:00
ide	blk_end_request: changing ide-cd (take 4)	2008-01-28 10:37:06 +01:00
ieee1394	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2008-01-25 17:19:08 -08:00
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25	2008-01-29 22:54:01 +11:00
input	[ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix	2008-01-28 13:13:25 +00:00
isdn
kvm
leds
lguest
macintosh	i2c: Kill rogue driver IDs	2008-01-27 18:14:47 +01:00
mca
md
media	i2c: Drivers stop using the redundant client list	2008-01-27 18:14:51 +01:00
message	blk_end_request: changing i2o_block (take 4)	2008-01-28 10:36:50 +01:00
mfd	[ARM] Fix class_device damage caused by 0c55445f20	2008-01-28 10:59:09 +00:00
misc
mmc	Merge branch 'blk-end-request' of git://git.kernel.dk/linux-2.6-block	2008-01-29 08:51:32 +11:00
mtd
net	[net] Gracefully handle shared e1000/1000e driver PCI ID's	2008-01-31 00:30:15 +11:00
nubus
of
oprofile
parisc	[PARISC]: Fix build after ipv4_is_*() changes.	2008-01-28 14:58:20 -08:00
parport
pci
pcmcia	[ARM] pxa: move memory controller registers into pxa2xx-regs.h	2008-01-26 15:07:54 +00:00
pnp
power
ps3
rapidio	remove __attribute_used__	2008-01-28 23:21:18 +01:00
rtc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2008-01-29 08:52:50 +11:00
s390	[VLAN]: Turn VLAN_DEV_INFO into inline function	2008-01-28 15:08:32 -08:00
sbus
scsi	[NETNS]: Consolidate kernel netlink socket destruction.	2008-01-28 15:08:07 -08:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2008-01-29 08:52:50 +11:00
sh
sn
spi	[ARM] pxa: make pxa2xx_spi driver use ssp_request()/ssp_free()	2008-01-26 15:07:52 +00:00
ssb	ssb: Add boardflags_hi field to the sprom data structure	2008-01-28 15:09:52 -08:00
tc
telephony
uio
usb	Merge branch 'pxa-plat' into devel	2008-01-28 13:21:38 +00:00
video	Merge branches 'at91', 'ep93xx', 'iop', 'kprobes', 'ks8695', 'misc', 'msm', 's3c2410', 'sa1100' and 'vfp' into devel	2008-01-28 13:21:21 +00:00
virtio
w1	i2c: normal_i2c can be made const (remaining drivers)	2008-01-27 18:14:47 +01:00
watchdog
xen
zorro
Kconfig
Makefile