rpms/kernel-xen/devel/configs config-x86-generic,1.5,1.6

[fedora-cvs-commits redhat com]

Author: quintela

Update of /cvs/dist/rpms/kernel-xen/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv15600/configs

Modified Files:
	config-x86-generic 
Log Message:
merged with rawhide 1.1884


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86-generic,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-x86-generic	26 Jan 2006 22:14:35 -0000	1.5
+++ config-x86-generic	31 Jan 2006 21:26:17 -0000	1.6
@@ -208,7 +208,7 @@
 CONFIG_KPROBES=y
 
 # FIXME: Disable before release.
-CONFIG_DEBUG_PAGEALLOC=y
+# CONFIG_DEBUG_PAGEALLOC is not set
 
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y