summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2010-12-15 23:24:41 -0500
committerKyle McMartin <kyle@redhat.com>2010-12-15 23:24:41 -0500
commitc6781123e5747130611e984918856076200f6395 (patch)
treef1ef240d77425c4f08925e7d75763ab26f8d3946
parent72be6aa09270be935d3f0fd6a7af327414286429 (diff)
downloadkernel-c6781123e5747130611e984918856076200f6395.tar.gz
kernel-c6781123e5747130611e984918856076200f6395.tar.xz
kernel-c6781123e5747130611e984918856076200f6395.zip
linux 2.6.37-rc6
-rw-r--r--.gitignore3
-rw-r--r--kernel.spec8
-rw-r--r--sources3
3 files changed, 8 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index ca1bf4144..2a9f5306b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,4 @@ patch-*.bz2
clog
*.rpm
kernel-2.6.*/
-/patch-2.6.37-rc5.bz2
-/patch-2.6.37-rc5-git5.bz2
+/patch-2.6.37-rc6.bz2
diff --git a/kernel.spec b/kernel.spec
index 62d248fc5..5dca0170c 100644
--- 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 5
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1927,6 +1927,10 @@ fi
# || ||
%changelog
+* Wed Dec 15 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.rc6.git0.1
+- Linux 2.6.37-rc6
+- Re-activate acpi patch which rejected on the previous commit.
+
* Wed Dec 15 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.rc5.git5.1
- 2.6.37-rc5-git5
diff --git a/sources b/sources
index 47cc09efa..f90d2b8d6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
61f3739a73afb6914cb007f37fb09b62 linux-2.6.36.tar.bz2
-a84cf559615b5168ec1d5591841601ed patch-2.6.37-rc5.bz2
-8e0b899768fd82d227ddc8c9e6d6d220 patch-2.6.37-rc5-git5.bz2
+bdc7a207c56dc6e2fc4a548c50e63289 patch-2.6.37-rc6.bz2