]> 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)
commit9a83c6adda7d0718adb8c0e123e152028893af11
treea2f99470bd0fe43f5cf57812fca969bb3ca3c451
parentd4f2b5d463184dbe6d3aa6e80e8e947b22eedc2f
parent93495e9fd36c5b2c74a757fada81b13404499a64
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