mac80211: reorganize patches, fold in patches that were merged upstream