ia64/xen-unstable

changeset 6101:2caa8e1e2111

merge?
author cl349@firebug.cl.cam.ac.uk
date Wed Aug 10 21:55:36 2005 +0000 (2005-08-10)
parents a5c488cd3627 c7b1c9b5e024
children 3229cda2d6f1
files linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64 linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c linux-2.6-xen-sparse/drivers/xen/blkback/Makefile linux-2.6-xen-sparse/drivers/xen/blkback/control.c linux-2.6-xen-sparse/drivers/xen/blkback/vbd.c tools/console/client/main.c tools/xenstore/Makefile
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64	Wed Aug 10 17:06:29 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64	Wed Aug 10 21:55:36 2005 +0000
     1.3 @@ -669,7 +669,7 @@ CONFIG_EXT3_FS_SECURITY=y
     1.4  CONFIG_JBD=m
     1.5  # CONFIG_JBD_DEBUG is not set
     1.6  CONFIG_FS_MBCACHE=y
     1.7 -CONFIG_REISERFS_FS=m
     1.8 +CONFIG_REISERFS_FS=y
     1.9  # CONFIG_REISERFS_CHECK is not set
    1.10  CONFIG_REISERFS_PROC_INFO=y
    1.11  CONFIG_REISERFS_FS_XATTR=y