Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 23 Nov 2014 17:56:35 +0000 (19:56 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 23 Nov 2014 17:56:35 +0000 (19:56 +0200)
commitaeb8f932080d62cdc305a7ccca9d60de34908b30
treef563df19e10e0d1fb5f8ab73902cc1d39f2ec177
parentcaf1578aefe7ebbc22376737e91ffa29ac14a33f
parent9e6f3f472c8f95021ad048acc7cd3e40a827f8ce
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
drivers/net/wireless/iwlwifi/mvm/fw.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mvm.h
drivers/net/wireless/iwlwifi/mvm/ops.c
drivers/net/wireless/iwlwifi/pcie/trans.c