[linux-firmware] - rebase to upstream release + add new radeon NI firmwares.

[Dave Airlie]

commit 8e3d4346cf123dc9e490c27dda6465cfb088156d
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Jan 7 14:55:34 2011 +1000

    - rebase to upstream release + add new radeon NI firmwares.

 linux-firmware.spec |   10 ++++++++--
 sources             |    3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/linux-firmware.spec b/linux-firmware.spec
index a176f91..067c216 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,8 +1,8 @@
 %define nvfw nouveau-firmware-1
 
 Name:		linux-firmware
-Version:	20100806
-Release:	4%{?dist}
+Version:	20101221
+Release:	1%{?dist}
 Summary:	Firmware files used by the Linux kernel
 
 Group:		System Environment/Kernel
@@ -10,6 +10,7 @@ License:	GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
 URL:		http://www.kernel.org/
 Source0:	ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/%{name}-%{version}.tar.bz2
 Source1:	%{nvfw}.tar.bz2
+Source2:	radeon-ni-fw.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Provides:	kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
@@ -24,6 +25,8 @@ operate.
 %prep
 %setup -q -n linux-firmware-%{version} -b1
 
+tar -jxvf %{SOURCE2}
+cd -
 
 %build
 # Remove firmware shipped in separate packages already
@@ -60,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/*
 
 %changelog
+* Fri Jan 07 2011 Dave Airlie <airlied at redhat.com> 20101221-1
+- rebase to upstream release + add new radeon NI firmwares.
+
 * Thu Aug 12 2010 Hicham HAOUARI <hicham.haouari at gmail.com> 20100806-4
 - Really obsolete ueagle-atm4-firmware
 
diff --git a/sources b/sources
index 27472af..6c44405 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-58aa7317b56effb599c29e4423118ee5  linux-firmware-20100806.tar.bz2
 554e432993f138bd5c6704dbca109d71  nouveau-firmware-1.tar.bz2
+05755bab87f9a72dfb5863d443c99b2f  linux-firmware-20101221.tar.bz2
+268e466b70f48ddf01297b18c99beb30  radeon-ni-fw.tar.bz2