Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Wed, 10 Jun 2015 10:44:58 +0000 (12:44 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 10 Jun 2015 10:45:09 +0000 (12:45 +0200)
commit206c59d1d7d42bcafc1d7f1e476e87e4427e2345
treea2f99470bd0fe43f5cf57812fca969bb3ca3c451
parent5ec596c41bba6f4e3eeef5dc089afc8eaa702a7e
parentc3eee1fb1d308564ada5f7ea57bc51efc6130b37
Merge remote-tracking branch 'net-next/master' into mac80211-next

Merge back net-next to get wireless driver changes (from Kalle)
to be able to create the API change across all trees properly.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/iwlwifi/mvm/mac80211.c
net/mac80211/cfg.c
net/mac80211/key.c
net/mac80211/key.h