summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-03-01 08:53:59 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-03-01 08:53:59 -0500
commitf5e36b421c636b05a9ef63763b1eff7f02587c7e (patch)
tree18c4080c4c239aadb0d6d66b071ead22aff6a6ee
parentd0bae3101fb1b763c754bdacaf523f8bb4d86b6e (diff)
downloadkernel-f5e36b421c636b05a9ef63763b1eff7f02587c7e.tar.gz
kernel-f5e36b421c636b05a9ef63763b1eff7f02587c7e.tar.xz
kernel-f5e36b421c636b05a9ef63763b1eff7f02587c7e.zip
Linux v3.8-10206-gb0af9cd
-rw-r--r--config-generic7
-rw-r--r--config-x86-generic2
-rw-r--r--kernel.spec5
-rw-r--r--sources2
4 files changed, 11 insertions, 5 deletions
diff --git a/config-generic b/config-generic
index b2846ad1c..941d7ebb5 100644
--- a/config-generic
+++ b/config-generic
@@ -4163,9 +4163,10 @@ CONFIG_HWMON=y
CONFIG_THERMAL_HWMON=y
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-CONFIG_FAIR_SHARE=y
-CONFIG_STEP_WISE=y
-# CONFIG_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+# CONFIG_THERMAL_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_EMULATION is not set
# CONFIG_CPU_THERMAL is not set
CONFIG_INOTIFY=y
diff --git a/config-x86-generic b/config-x86-generic
index 75e604d9b..5bb9d7268 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -435,6 +435,8 @@ CONFIG_INTEL_MEI_ME=y
# CONFIG_X86_INTEL_LPSS is not set
+# CONFIG_INTEL_POWERCLAMP is not set
+
CONFIG_VMWARE_VMCI=m
CONFIG_VMWARE_VMCI_VSOCKETS=m
diff --git a/kernel.spec b/kernel.spec
index a2945d141..10294e250 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 13
+%define gitrev 14
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2267,6 +2267,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Mar 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git14.1
+- Linux v3.8-10206-gb0af9cd
+
* Fri Mar 01 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git13.1
- Linux v3.8-9761-gde1a226
diff --git a/sources b/sources
index dbd1ac83d..3600ae584 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
1c738edfc54e7c65faeb90c436104e2f linux-3.8.tar.xz
-b6cf81b28b9bc7b03539a99624f7408f patch-3.8-git13.xz
+1c77689fd34bfa08740cc47f394f26ee patch-3.8-git14.xz