Merge branch 'upstream-fixes'

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/Makefile
Simple merge

diff --cc drivers/net/ns83820.c
Simple merge

diff --cc drivers/net/r8169.c
Simple merge

diff --cc drivers/net/skge.c
Simple merge

diff --cc drivers/net/wan/syncppp.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc net/ieee80211/ieee80211_module.c
Simple merge

diff --cc net/ieee80211/ieee80211_tx.c
Simple merge