Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)