mac80211: merge version 2010-09-14 from trunk