aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds2007-06-03 12:41:05 -0700
committerLinus Torvalds2007-06-03 12:41:05 -0700
commitc1a13ff57ab1ce52a0aae9984594dbfcfbaf68c0 (patch)
treec9f99adf0c1940ab0daeb2c3287152e49b096679 /Makefile
parent7dfb1716d717e41c07410bab52760d865caee12b (diff)
parentbeaf53bff7985ad57b5b6983f3d6142380449370 (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 'Makefile')
0 files changed, 0 insertions, 0 deletions