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

Browse source

...

This commit is contained in:

Linus Torvalds 2005-12-12 16:41:37 -08:00

parent 1ff8038988 016cc85072

commit 238523e1a1

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

5

drivers/net/pcnet32.c

View file

4

drivers/net/sk98lin/skge.c

View file