]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit93102edcaeae15a92c1964db8a4f648e733f278d
treea2f99470bd0fe43f5cf57812fca969bb3ca3c451
parent4f4c5f3b49f092d89841a21b7ebedc77936189ba
parent4a065dc1fe46bfcf96824b42792075b63288cc72
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