Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next