Merge branch 'master' into upstream

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/net/wireless/bcm43xx/bcm43xx_main.c
Simple merge

diff --cc include/net/ieee80211.h
Simple merge

diff --cc net/ieee80211/softmac/ieee80211softmac_assoc.c
Simple merge