Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2012-09-07 15:07:55 -04:00
parent 2461c7d60f f10723841e
commit fac805f8c1
1766 changed files with 90001 additions and 43478 deletions
--- a/drivers/net/wireless/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/rx.c
@@ -565,7 +565,7 @@ static void iwl_irq_handle_error(struct iwl_trans *trans)
 	}

 	iwl_dump_csr(trans);
-	iwl_dump_fh(trans, NULL, false);
+	iwl_dump_fh(trans, NULL);

 	iwl_op_mode_nic_error(trans->op_mode);
 }