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 21:42:17 -08:00

parent b11d0e48aa 1cf9e8a786

commit 7cd082f014

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

10

drivers/net/skge.c

View file

2

net/ieee80211/Kconfig

View file