Merge branch 'upstream-fixes' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Browse source

...

This commit is contained in:

Linus Torvalds 2005-09-23 16:44:01 -07:00

parent 7f28f394bd c886861138

commit 2ead1aa6f1

2 changed files with 21 additions and 3 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

2

drivers/net/8390.c

View file

22

drivers/net/skge.c

View file