Merge remote-tracking branch 'iwlwifi-fixes/master' into next

[karo-tx-linux.git] / drivers / net / wireless / intel / iwlwifi / iwl-7000.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-7000.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-7000.c