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 2006-02-28 20:57:20 -08:00

parent 77eebf346d 958ddb75b0

commit 96789ac4b3

5 changed files with 29 additions and 105 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

37

drivers/net/8139cp.c

View file

77

drivers/net/sky2.c

View file

1

drivers/net/sky2.h

View file

3

drivers/net/via-velocity.c

View file

16

net/ieee80211/ieee80211_rx.c

View file