ia64/xen-unstable

changeset 8774:2710f2fe624a

Clarify dual licensing of gnttab.[ch] files in Linux.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue Feb 07 12:59:27 2006 +0100 (2006-02-07)
parents 87a83b44930b
children 74b1de89e9f7 df98f37a88b0
files linux-2.6-xen-sparse/drivers/xen/core/gnttab.c linux-2.6-xen-sparse/include/xen/gnttab.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c	Tue Feb 07 11:54:09 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c	Tue Feb 07 12:59:27 2006 +0100
     1.3 @@ -5,6 +5,27 @@
     1.4   * 
     1.5   * Copyright (c) 2005, Christopher Clark
     1.6   * Copyright (c) 2004-2005, K A Fraser
     1.7 + * 
     1.8 + * This file may be distributed separately from the Linux kernel, or
     1.9 + * incorporated into other software packages, subject to the following license:
    1.10 + * 
    1.11 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    1.12 + * of this source file (the "Software"), to deal in the Software without
    1.13 + * restriction, including without limitation the rights to use, copy, modify,
    1.14 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    1.15 + * and to permit persons to whom the Software is furnished to do so, subject to
    1.16 + * the following conditions:
    1.17 + * 
    1.18 + * The above copyright notice and this permission notice shall be included in
    1.19 + * all copies or substantial portions of the Software.
    1.20 + * 
    1.21 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    1.22 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    1.23 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    1.24 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    1.25 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    1.26 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    1.27 + * IN THE SOFTWARE.
    1.28   */
    1.29  
    1.30  #include <linux/config.h>
     2.1 --- a/linux-2.6-xen-sparse/include/xen/gnttab.h	Tue Feb 07 11:54:09 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/xen/gnttab.h	Tue Feb 07 12:59:27 2006 +0100
     2.3 @@ -8,6 +8,27 @@
     2.4   * 
     2.5   * Copyright (c) 2004-2005, K A Fraser
     2.6   * Copyright (c) 2005, Christopher Clark
     2.7 + * 
     2.8 + * This file may be distributed separately from the Linux kernel, or
     2.9 + * incorporated into other software packages, subject to the following license:
    2.10 + * 
    2.11 + * Permission is hereby granted, free of charge, to any person obtaining a copy
    2.12 + * of this source file (the "Software"), to deal in the Software without
    2.13 + * restriction, including without limitation the rights to use, copy, modify,
    2.14 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
    2.15 + * and to permit persons to whom the Software is furnished to do so, subject to
    2.16 + * the following conditions:
    2.17 + * 
    2.18 + * The above copyright notice and this permission notice shall be included in
    2.19 + * all copies or substantial portions of the Software.
    2.20 + * 
    2.21 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    2.22 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    2.23 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    2.24 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    2.25 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    2.26 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
    2.27 + * IN THE SOFTWARE.
    2.28   */
    2.29  
    2.30  #ifndef __ASM_GNTTAB_H__