Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 4 Oct 2005 02:06:19 +0000 (22:06 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 4 Oct 2005 02:06:19 +0000 (22:06 -0400)
1  2 
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/ns83820.c
drivers/net/r8169.c
drivers/net/skge.c
drivers/net/wan/syncppp.c
include/linux/netdevice.h
net/ieee80211/ieee80211_module.c
net/ieee80211/ieee80211_tx.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge