Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Browse source

...

This commit is contained in:

Linus Torvalds 2005-09-02 00:46:53 -07:00

parent 712fbdd333 ee05f031ec

commit 44757223cd

4 changed files with 583 additions and 335 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

873

drivers/net/iseries_veth.c

View file

46

drivers/net/iseries_veth.h

View file

2

drivers/net/tulip/de2104x.c

View file

1

drivers/net/tulip/tulip_core.c

View file