Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 26 May 2015 16:20:34 +0000 (19:20 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 26 May 2015 16:20:57 +0000 (19:20 +0300)
commit04c9599d1a4cdd91b4c0bded3b12cc8203b68a2c
tree9863c0473469c5b594ad0e5dab29d37b6900bdf8
parent05c3274d56ee783cb291a779ec2b369e9d172450
parent292208914d8ca5a41cf68c2f1d2810a2ea2044e9
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/iwlwifi/iwl-7000.c
drivers/net/wireless/iwlwifi/mvm/d3.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/rs.c
drivers/net/wireless/iwlwifi/pcie/trans.c