Merge /spare/repo/netdev-2.6 branch 'ieee80211'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/wireless/airo.c
Simple merge

diff --cc drivers/net/wireless/wavelan_cs.c
Simple merge

diff --cc drivers/net/wireless/wavelan_cs.p.h
Simple merge

diff --cc drivers/net/wireless/wl3501_cs.c
Simple merge