mac80211: merge latest changes from trunk (as of r29296)