diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 16:38:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 16:38:05 -0700 |
| commit | cbdd3deb52ac9b013a63e4a60530717f75ce3177 (patch) | |
| tree | 50fb6c194616cbbea2e8f3392b90223780c0714d /drivers/net/cxgb3 | |
| parent | 4dcf39c6cc5f9f01c46aa71fe95cae9927edeeab (diff) | |
| parent | c196d80f994ef4ffefd5a7c62e3f42bd75d538bc (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
Fix a potential NULL pointer dereference in mace_interrupt() in drivers/net/pcmcia/nmclan_cs.c
PATCH kernel 2.6.22] PCMCIA-NETDEV : modify smc91c92_cs.c to become SMP safe
S2io: Increment received packet count correctly
S2io: Fix crash when resetting adapter
S2io: Mask spurious interrupts
S2IO: Implementing review comments from old patches
S2IO: Checking for the return value of pci map function
S2IO: Removing MSI support from driver
S2IO: Removing 3 buffer mode support from the driver
netxen: drop redudant spinlock
netxen: Fix interrupt handling for multiport adapters
netxen: re-init station address after h/w init
tulip: Remove tulip maintainer
forcedeth: mac address correct
gfar: Fix modpost warning
lib8390: comment on locking by Alan Cox
Fix a potential NULL pointer dereference in write_bulk_callback() in drivers/net/usb/pegasus.c
Diffstat (limited to 'drivers/net/cxgb3')
0 files changed, 0 insertions, 0 deletions