[linux-firmware/f21] Update to latest upstream git snapshot

[Josh Boyer]

commit 26f0b9120669be217e5b54cf98ed80250613a511
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Thu Jan 15 14:14:42 2015 -0500

    Update to latest upstream git snapshot
    
    - Adjust iwl{3160,7260} version numbers (rhbz 1167695)

 .gitignore          |    1 +
 linux-firmware.spec |   17 ++++++++++++-----
 sources             |    2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66b2ac3..7764ad1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ linux-firmware-20100806.tar.bz2
 /linux-firmware-20140828.tar.gz
 /linux-firmware-20140912.tar.gz
 /linux-firmware-20141013.tar.gz
+/linux-firmware-20150115.tar.gz
diff --git a/linux-firmware.spec b/linux-firmware.spec
index 9d5b7e6..1c7b15b 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,10 +1,10 @@
-%global checkout 0e5f6377
-%global firmware_release 41
+%global checkout 78535e88
+%global firmware_release 42
 
 %global _firmwarepath	/usr/lib/firmware
 
 Name:		linux-firmware
-Version:	20141013
+Version:	20150115
 Release:	%{firmware_release}.git%{checkout}%{?dist}
 Summary:	Firmware files used by the Linux kernel
 
@@ -193,7 +193,8 @@ contained inside the provided LICENSE file. Please read it carefully.
 %package -n iwl7260-firmware
 Summary:	Firmware for Intel(R) Wireless WiFi Link 7260 Series Adapters
 License:	Redistributable, no modification permitted
-Version:	25.222.9.0
+Epoch:		1
+Version:	23.11.10.0
 Release:	%{firmware_release}%{?dist}
 %description -n iwl7260-firmware
 This package contains the firmware required by the Intel wireless drivers
@@ -203,7 +204,8 @@ contained inside the provided LICENSE file. Please read it carefully.
 %package -n iwl3160-firmware
 Summary:	Firmware for Intel(R) Wireless WiFi Link 3160 Series Adapters
 License:	Redistributable, no modification permitted
-Version:	25.222.9.0
+Epoch:		1
+Version:	23.11.10.0
 Release:	%{firmware_release}%{?dist}
 %description -n iwl3160-firmware
 This package contains the firmware required by the Intel wireless drivers
@@ -367,6 +369,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc WHENCE LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-7260-*.ucode
 %{_firmwarepath}/iwlwifi-7265-*.ucode
+%{_firmwarepath}/iwlwifi-7265D-*.ucode
 
 %files -n iwl3160-firmware
 %defattr(-,root,root,-)
@@ -403,6 +406,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc WHENCE LICENCE.* LICENSE.*
 
 %changelog
+* Thu Jan 15 2015 Josh Boyer <jwboyer at fedoraproject.org> 20150115-42.git78535e88.fc21
+- Update to latest upstream git snapshot
+- Adjust iwl{3160,7260} version numbers (rhbz 1167695)
+
 * Tue Oct 14 2014 Josh Boyer <jwboyer at fedoraproject.org> 20141013-41.git0e5f6377.fc21
 - Fix 3160/7260 version numbers (rhbz 1110522)
 
diff --git a/sources b/sources
index 7742c44..b592939 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8198305f6c15fa23b8eea6e1537a2e4  linux-firmware-20141013.tar.gz
+dbf64c7fa8c246e0f41b76aec3e62ee6  linux-firmware-20150115.tar.gz