UBUNTU: iwlwifi fixup

Fixed up some conflicts after rebasing against 13f50084Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: iwlwifi fixup
Fixed up some conflicts after rebasing against 13f50084Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
564f9706 · Tim Gardner · Seth Forshee · d90dd93e · 564f9706 · 564f9706
Commit 564f9706 authored Aug 09, 2011 by Tim Gardner Committed by Seth Forshee Jan 28, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

iwlwifi-5000-5.ucode iwlwifi-5000-5.ucode +0 -0

iwlwifi-6000g2b-5.ucode iwlwifi-6000g2b-5.ucode +0 -0

No files found.
--- a/iwlwifi-5000-5.ucode
+++ b/iwlwifi-5000-5.ucode
--- a/iwlwifi-6000g2b-5.ucode
+++ b/iwlwifi-6000g2b-5.ucode