1.1 --- a/MAINTAINERS	Fri Jan 07 11:55:35 2011 +0000
     1.2 +++ b/MAINTAINERS	Fri Jan 07 13:30:04 2011 +0000
     1.3 @@ -201,7 +201,7 @@ F:	tools/xentrace/
     1.4  F:	xen/common/trace.c
     1.5  
     1.6  THE REST
     1.7 -M:	Keir Fraser <keir.fraser@citrix.com>
     1.8 +M:	Keir Fraser <keir@xen.org>
     1.9  S:	Supported
    1.10  F:	*
    1.11  F:	*/

     2.1 --- a/tools/firmware/hvmloader/cacheattr.c	Fri Jan 07 11:55:35 2011 +0000
     2.2 +++ b/tools/firmware/hvmloader/cacheattr.c	Fri Jan 07 13:30:04 2011 +0000
     2.3 @@ -4,7 +4,7 @@
     2.4   * Copyright (c) 2008, Citrix Systems, Inc.
     2.5   * 
     2.6   * Authors:
     2.7 - *    Keir Fraser <keir.fraser@citrix.com>
     2.8 + *    Keir Fraser <keir@xen.org>
     2.9   * 
    2.10   * This program is free software; you can redistribute it and/or modify it
    2.11   * under the terms and conditions of the GNU General Public License,

     3.1 --- a/tools/firmware/hvmloader/smp.c	Fri Jan 07 11:55:35 2011 +0000
     3.2 +++ b/tools/firmware/hvmloader/smp.c	Fri Jan 07 13:30:04 2011 +0000
     3.3 @@ -4,7 +4,7 @@
     3.4   * Copyright (c) 2008, Citrix Systems, Inc.
     3.5   * 
     3.6   * Authors:
     3.7 - *    Keir Fraser <keir.fraser@citrix.com>
     3.8 + *    Keir Fraser <keir@xen.org>
     3.9   * 
    3.10   * This program is free software; you can redistribute it and/or modify it
    3.11   * under the terms and conditions of the GNU General Public License,

     4.1 --- a/tools/firmware/hvmloader/tests.c	Fri Jan 07 11:55:35 2011 +0000
     4.2 +++ b/tools/firmware/hvmloader/tests.c	Fri Jan 07 13:30:04 2011 +0000
     4.3 @@ -4,7 +4,7 @@
     4.4   * Copyright (c) 2008, Citrix Systems, Inc.
     4.5   * 
     4.6   * Authors:
     4.7 - *    Keir Fraser <keir.fraser@citrix.com>
     4.8 + *    Keir Fraser <keir@xen.org>
     4.9   * 
    4.10   * This program is free software; you can redistribute it and/or modify it
    4.11   * under the terms and conditions of the GNU General Public License,

     5.1 --- a/tools/firmware/rombios/32bitgateway.c	Fri Jan 07 11:55:35 2011 +0000
     5.2 +++ b/tools/firmware/rombios/32bitgateway.c	Fri Jan 07 13:30:04 2011 +0000
     5.3 @@ -22,7 +22,7 @@
     5.4   * Copyright (c) 2008, Citrix Systems, Inc.
     5.5   *
     5.6   * Author: Stefan Berger <stefanb@us.ibm.com>
     5.7 - * Author: Keir Fraser <keir.fraser@citrix.com>
     5.8 + * Author: Keir Fraser <keir@xen.org>
     5.9   */
    5.10  
    5.11  /*

     6.1 --- a/xen/arch/x86/boot/reloc.c	Fri Jan 07 11:55:35 2011 +0000
     6.2 +++ b/xen/arch/x86/boot/reloc.c	Fri Jan 07 13:30:04 2011 +0000
     6.3 @@ -7,7 +7,7 @@
     6.4   * Copyright (c) 2009, Citrix Systems, Inc.
     6.5   * 
     6.6   * Authors:
     6.7 - *    Keir Fraser <keir.fraser@citrix.com>
     6.8 + *    Keir Fraser <keir@xen.org>
     6.9   */
    6.10  
    6.11  asm (

     7.1 --- a/xen/arch/x86/hvm/emulate.c	Fri Jan 07 11:55:35 2011 +0000
     7.2 +++ b/xen/arch/x86/hvm/emulate.c	Fri Jan 07 13:30:04 2011 +0000
     7.3 @@ -6,7 +6,7 @@
     7.4   * Copyright (c) 2008, Citrix Systems, Inc.
     7.5   * 
     7.6   * Authors:
     7.7 - *    Keir Fraser <keir.fraser@citrix.com>
     7.8 + *    Keir Fraser <keir@xen.org>
     7.9   */
    7.10  
    7.11  #include <xen/config.h>

     8.1 --- a/xen/arch/x86/hvm/vmx/realmode.c	Fri Jan 07 11:55:35 2011 +0000
     8.2 +++ b/xen/arch/x86/hvm/vmx/realmode.c	Fri Jan 07 13:30:04 2011 +0000
     8.3 @@ -6,7 +6,7 @@
     8.4   * Copyright (c) 2007-2008 Citrix Systems, Inc.
     8.5   * 
     8.6   * Authors:
     8.7 - *    Keir Fraser <keir.fraser@citrix.com>
     8.8 + *    Keir Fraser <keir@xen.org>
     8.9   */
    8.10  
    8.11  #include <xen/config.h>

     9.1 --- a/xen/arch/x86/x86_emulate.c	Fri Jan 07 11:55:35 2011 +0000
     9.2 +++ b/xen/arch/x86/x86_emulate.c	Fri Jan 07 13:30:04 2011 +0000
     9.3 @@ -6,7 +6,7 @@
     9.4   * Copyright (c) 2008, Citrix Systems, Inc.
     9.5   * 
     9.6   * Authors:
     9.7 - *    Keir Fraser <keir.fraser@citrix.com>
     9.8 + *    Keir Fraser <keir@xen.org>
     9.9   */
    9.10  
    9.11  #include <asm/x86_emulate.h>

    10.1 --- a/xen/common/tasklet.c	Fri Jan 07 11:55:35 2011 +0000
    10.2 +++ b/xen/common/tasklet.c	Fri Jan 07 13:30:04 2011 +0000
    10.3 @@ -8,7 +8,7 @@
    10.4   * Copyright (c) 1992, Linus Torvalds
    10.5   * 
    10.6   * Authors:
    10.7 - *    Keir Fraser <keir.fraser@citrix.com>
    10.8 + *    Keir Fraser <keir@xen.org>
    10.9   */
   10.10  
   10.11  #include <xen/config.h>

    11.1 --- a/xen/include/asm-x86/hvm/emulate.h	Fri Jan 07 11:55:35 2011 +0000
    11.2 +++ b/xen/include/asm-x86/hvm/emulate.h	Fri Jan 07 13:30:04 2011 +0000
    11.3 @@ -6,7 +6,7 @@
    11.4   * Copyright (c) 2008 Citrix Systems, Inc.
    11.5   * 
    11.6   * Authors:
    11.7 - *    Keir Fraser <keir.fraser@citrix.com>
    11.8 + *    Keir Fraser <keir@xen.org>
    11.9   */
   11.10  
   11.11  #ifndef __ASM_X86_HVM_EMULATE_H__

    12.1 --- a/xen/include/asm-x86/x86_emulate.h	Fri Jan 07 11:55:35 2011 +0000
    12.2 +++ b/xen/include/asm-x86/x86_emulate.h	Fri Jan 07 13:30:04 2011 +0000
    12.3 @@ -6,7 +6,7 @@
    12.4   * Copyright (c) 2008, Citrix Systems, Inc.
    12.5   * 
    12.6   * Authors:
    12.7 - *    Keir Fraser <keir.fraser@citrix.com>
    12.8 + *    Keir Fraser <keir@xen.org>
    12.9   */
   12.10  
   12.11  #ifndef __ASM_X86_X86_EMULATE_H__

    13.1 --- a/xen/include/public/arch-x86/cpuid.h	Fri Jan 07 11:55:35 2011 +0000
    13.2 +++ b/xen/include/public/arch-x86/cpuid.h	Fri Jan 07 13:30:04 2011 +0000
    13.3 @@ -24,7 +24,7 @@
    13.4   * Copyright (c) 2007 Citrix Systems, Inc.
    13.5   * 
    13.6   * Authors:
    13.7 - *    Keir Fraser <keir.fraser@citrix.com>
    13.8 + *    Keir Fraser <keir@xen.org>
    13.9   */
   13.10  
   13.11  #ifndef __XEN_PUBLIC_ARCH_X86_CPUID_H__