Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 6 Jul 2014 08:15:30 +0000 (11:15 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 6 Jul 2014 08:15:30 +0000 (11:15 +0300)
commit6e55eed8f15484bb6504c2d54bf9283681f0ed9d
tree3d7ec45a0cdbd1547b8dba0824be42184a3907cf
parent44621b82aa7ce90b7d4a767be097a0a43da1d1e8
parent15be8e89cdd999124a2307ffd6dacb895c3b802e
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
drivers/net/wireless/iwlwifi/mvm/mac80211.c