Merge branch 'f15'

2011-02-22 12:59:23 -05:00 · 2011-02-22 12:59:23 -05:00 · d7c7c8a114
commit d7c7c8a114
parent 3221a485fd 64f9d17204
2 changed files with 6 additions and 4 deletions
--- a/kernel.spec
+++ b/kernel.spec
@ -82,9 +82,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 5
+%define rcrev 6
 # The git snapshot level
-%define gitrev 7
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@ -1957,6 +1957,9 @@ fi
 # and build.

 %changelog
+* Tue Feb 22 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc6.git0.1
+- Linux 2.6.38-rc6
+
 * Tue Feb 22 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc5.git7.1
 - Linux 2.6.38-rc5-git7

--- a/3
+++ b/3
@ -1,3 +1,2 @@
 c8ee37b4fdccdb651e0603d35350b434  linux-2.6.37.tar.bz2
-1047f39477ddccf8219443bb2982c87f  patch-2.6.38-rc5.bz2
-3f447350a3f4adf56b92c2f2208e15e5  patch-2.6.38-rc5-git7.bz2
+7f88891e35d060b8f1f436cf05125c36  patch-2.6.38-rc6.bz2