summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-x86-32-generic2
-rw-r--r--kernel.spec7
-rw-r--r--sources3
3 files changed, 8 insertions, 4 deletions
diff --git a/config-x86-32-generic b/config-x86-32-generic
index f10769f48..beeb6f02f 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -204,3 +204,5 @@ CONFIG_I2O_CONFIG_OLD_IOCTL=y
CONFIG_I2O_BUS=m
# CONFIG_EDAC_SBRIDGE is not set
+
+# CONFIG_X86_WANT_INTEL_MID is not set
diff --git a/kernel.spec b/kernel.spec
index 64e1c4c43..00fbc4f0d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,9 +85,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 4
+%define rcrev 5
# The git snapshot level
-%define gitrev 6
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2228,6 +2228,9 @@ fi
# ||----w |
# || ||
%changelog
+* Sun Dec 11 2011 Kyle McMartin <kyle@redhat.com> - 3.0.0-0.rc5.git0.1
+- Linux 3.2-rc5
+
* Fri Dec 09 2011 John W. Linville <linville@redhat.com>
- Do a better job of cleaning-up compat-wireless between builds
diff --git a/sources b/sources
index b5219691d..d833dc3aa 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
8d43453f8159b2332ad410b19d86a931 linux-3.1.tar.bz2
-0f8c09d8ad9dda10166196cf1b5679bb patch-3.2-rc4.xz
+83560f29ec67cb44535c5d66d6cf9606 patch-3.2-rc5.xz
5360f273d6b9e930675bf48f9aad33f7 compat-wireless-2011-12-01.tar.bz2
-29842c531037d1e0c7b8a9ea0c7cacb4 patch-3.2-rc4-git6.xz