[kernel/f15/master] Linux 2.6.38-rc6-git4

[Chuck Ebbert]

commit 8ec9c79221062d9726981b0ce472d0a33b988641
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Thu Feb 24 22:31:53 2011 -0500

    Linux 2.6.38-rc6-git4

 ath5k-fix-fast-channel-change.patch |  213 -----------------------------------
 kernel.spec                         |   12 +-
 sources                             |    2 +-
 3 files changed, 6 insertions(+), 221 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 187843e..66123d2 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 2
+%global baserelease 1
 %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 6
 # The git snapshot level
-%define gitrev 2
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -732,8 +732,6 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
 
 Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
 
-Patch12438: ath5k-fix-fast-channel-change.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1347,9 +1345,6 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch
 # rhbz#662344,600690
 ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
 
-# rhbz#672778
-ApplyPatch ath5k-fix-fast-channel-change.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1953,6 +1948,9 @@ fi
 # and build.
 
 %changelog
+* Thu Feb 24 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.38-0.rc6.git4.1
+- Linux 2.6.38-rc6-git4
+
 * Thu Feb 24 2011 Matthew Garrett <mjg at redhat.com> 2.6.38-0.rc6.git2.2
 - linux-2.6-acpi-fix-implicit-notify.patch: Fix implicit notify when there's
   more than one device per GPE
diff --git a/sources b/sources
index 8491e17..88caa67 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 c8ee37b4fdccdb651e0603d35350b434  linux-2.6.37.tar.bz2
 7f88891e35d060b8f1f436cf05125c36  patch-2.6.38-rc6.bz2
-3ddbe38f2ca6ae526dd0017fafdf846a  patch-2.6.38-rc6-git2.bz2
+9a62ea5fbad62e74476ec31a915616f8  patch-2.6.38-rc6-git4.bz2