rpms/staging-kmod/F-16 staging-kmod.spec,1.52,1.53

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/staging-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18454

Modified Files:
	staging-kmod.spec 
Log Message:
Update to .2



Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-16/staging-kmod.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- staging-kmod.spec	2 May 2012 20:32:34 -0000	1.52
+++ staging-kmod.spec	2 May 2012 20:39:06 -0000	1.53
@@ -20,11 +20,7 @@
 
 Name:          staging-kmod
 Version:       3.3
-<<<<<<< staging-kmod.spec
-Release:       %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.9
-=======
-Release:       %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.1
->>>>>>> 1.51
+Release:       %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.2
 Summary:       Selected kernel modules from linux-staging
 
 Group:         System Environment/Kernel
@@ -134,36 +130,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Wed May 02 2012 Nicolas Chauvet <kwizart at gmail.com>
+* Wed May 02 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.3-2.2
 - rebuild for updated kernel
 
-<<<<<<< staging-kmod.spec
-* Wed May 02 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.3-1.8
-- rebuild for updated kernel
-
-* Sun Apr 22 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.3-1.7
-- rebuild for updated kernel
-
-* Mon Apr 16 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.3-1.6
-- rebuild for updated kernel
-
-* Thu Apr 12 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.3-1.5
-- rebuild for updated kernel
-
-* Sat Apr 07 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.3-1.4
-- rebuild for updated kernel
-
-* Tue Apr 03 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.3-1.3
-- rebuild for updated kernel
-
-* Fri Mar 30 2012 Nicolas Chauvet <kwizart at gmail.com> - 3.3-1.2
-- rebuild for updated kernel
-=======
 * Mon Apr 30 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-2.1
 - make a few things more robust for drivers that have subdirectories (fixes 
   #2265)
 - enbable a few options r8192e driver needs since 3.3 
->>>>>>> 1.51
 
 * Wed Mar 21 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.3-1.1
 - update to 3.3