Merge branch 'fixes' into next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Wed, 2 Mar 2016 07:35:38 +0000 (09:35 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Wed, 2 Mar 2016 07:35:38 +0000 (09:35 +0200)
commit53f09e742b0fdf14a2a2bfd2062ee96c9b3eedf0
tree3da4473f2168ff3ef075d57e6cfcc6dcabe6414b
parentb4f7a9d168d9f8204abf06d244a7938dd62b87b0
parent905e36ae172c83a30894a3adefab7d4f850fcf54
Merge branch 'fixes' into next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/fw.c
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
drivers/net/wireless/intel/iwlwifi/mvm/ops.c
drivers/net/wireless/intel/iwlwifi/mvm/tx.c