From: Reinette Chatre <reinette.chatre@xxxxxxxxx> Some iwlwifi updates. [PATCH 01/10] iwlwifi: refactor TX response flow [PATCH 02/10] iwlwifi: don't update TFD free counter for invalid station [PATCH 03/10] iwlwifi: parametrize eeprom versions [PATCH 04/10] iwlwifi: calibration command namespace renaming [PATCH 05/10] iwlwifi: convert correctly rate_n_flags to PLCP index for mimo3 packets [PATCH 06/10] iwlwifi: clear scanning bits upon failure [PATCH 07/10] iwlwifi: refactor tx byte count table usage [PATCH 08/10] iwlwifi: run through spell checker [PATCH 09/10] iwl3945: iwl3945_mac_get_tsf() should not return zero [PATCH 10/10] iwlwifi: Update reclaim flag John, the merge error seen with "iwlwifi: refactor TX response flow" was caused by conflict with "mac80211/drivers: rewrite the rate control API". These conflicts have now been resolved in this new patch. Thank you very much Reinette -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html