rpms/kernel/devel config-x86-generic, 1.101, 1.101.2.1 kernel.spec, 1.2037.2.4, 1.2037.2.5

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12871

Modified Files:
      Tag: private-f14-2_6_34
	config-x86-generic kernel.spec 
Log Message:
* Wed Jun 30 2010 Kyle McMartin <kyle at redhat.com>
- Disable MRST on x86 here as well.



Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.101
retrieving revision 1.101.2.1
diff -u -p -r1.101 -r1.101.2.1
--- config-x86-generic	22 Jun 2010 01:28:10 -0000	1.101
+++ config-x86-generic	30 Jun 2010 12:59:19 -0000	1.101.2.1
@@ -455,7 +455,7 @@ CONFIG_X86_MCE_AMD=y
 # CONFIG_X86_ANCIENT_MCE is not set
 # CONFIG_X86_MCE_INJECT is not set
 
-CONFIG_X86_MRST=y
+# CONFIG_X86_MRST is not set
 CONFIG_SFI=y
 
 CONFIG_INPUT_WINBOND_CIR=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2037.2.4
retrieving revision 1.2037.2.5
diff -u -p -r1.2037.2.4 -r1.2037.2.5
--- kernel.spec	29 Jun 2010 07:40:23 -0000	1.2037.2.4
+++ kernel.spec	30 Jun 2010 12:59:20 -0000	1.2037.2.5
@@ -1995,6 +1995,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Wed Jun 30 2010 Kyle McMartin <kyle at redhat.com>
+- Disable MRST on x86 here as well.
+
 * Tue Jun 29 2010 Kyle McMartin <kyle at redhat.com>
 - i915-fix-crt-hotplug-regression.patch: copy from rawhide.