[kernel] Linux 2.6.36-rc1-git3

[Chuck Ebbert]

commit 4b4acded4de82ec0085ef2279112e9913bb85bc7
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Fri Aug 20 23:51:22 2010 -0400

    Linux 2.6.36-rc1-git3
    
    Drop x86-cpu-fix-regression-in-amd-errata-checking-code.patch, now merged.

 kernel.spec                                        |   12 ++++----
 sources                                            |    2 +-
 ...ix-regression-in-amd-errata-checking-code.patch |   29 --------------------
 3 files changed, 7 insertions(+), 36 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 0499699..6bf22ed 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 4
+%global baserelease 5
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -84,7 +84,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 1
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -688,8 +688,6 @@ Patch12017: prevent-runtime-conntrack-changes.patch
 
 Patch12018: neuter_intel_microcode_load.patch
 
-Patch12019: x86-cpu-fix-regression-in-amd-errata-checking-code.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1256,8 +1254,6 @@ ApplyPatch disable-i8042-check-on-apple-mac.patch
 
 ApplyPatch neuter_intel_microcode_load.patch
 
-ApplyPatch x86-cpu-fix-regression-in-amd-errata-checking-code.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1865,6 +1861,10 @@ fi
 #                 ||     ||
 
 %changelog
+* Fri Aug 20 2010 Chuck Ebbert <cebbert at redhat.com> - 2.6.36-0.5.rc1.git3
+- Linux 2.6.36-rc1-git3
+- Drop x86-cpu-fix-regression-in-amd-errata-checking-code.patch, now merged.
+
 * Thu Aug 19 2010 Kyle McMartin <kmcmartin at redhat.com> - 2.6.36-0.4.rc1.git1
 - Run oldnoconfig on the configs during make prep.
 - Make the fix oldnoconfig patch a one liner.
diff --git a/sources b/sources
index badea28..d247483 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 091abeb4684ce03d1d936851618687b6  linux-2.6.35.tar.bz2
 4f51963b5e076fb87ab32bda229a524f  patch-2.6.36-rc1.bz2
-605f904e69fa5f67670505d8644ab47a  patch-2.6.36-rc1-git1.bz2
+e6b13a5770a0ee6bdd0c241e975420cd  patch-2.6.36-rc1-git3.bz2