diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-03 12:41:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-03 12:41:05 -0700 |
| commit | c1a13ff57ab1ce52a0aae9984594dbfcfbaf68c0 (patch) | |
| tree | c9f99adf0c1940ab0daeb2c3287152e49b096679 /arch/sh | |
| parent | 7dfb1716d717e41c07410bab52760d865caee12b (diff) | |
| parent | beaf53bff7985ad57b5b6983f3d6142380449370 (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:
NET: add MAINTAINERS entry for ucc_geth driver
myri10ge: report link up/down in standard ethtool way
NetXen: Removal of extra free_irq call
Update tulip maintainer email address
smc91x: sh solution engine fixes.
e1000: disable polling before registering netdevice
network drivers: eliminate unneeded kill_vid code
atl1: eliminate unneeded kill_vid code
8139cp: fix VLAN unregistration
sky2: Fix VLAN unregistration
VLAN: kill_vid is only useful for VLAN filtering devices
qla3xxx: device doesnt do hardware checksumming.
Diffstat (limited to 'arch/sh')
0 files changed, 0 insertions, 0 deletions