diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-18 15:07:18 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-18 15:07:18 +0000 |
commit | e601ef22bc5ec9332c8d785533895ee81c834b8a (patch) | |
tree | 4685a666fe2a553dccdfe7b4b3f88816d075b29e /include/asm-ia64/machvec_sn2.h | |
parent | 27754b34600770beb38e3ae12cb3f345f02e3797 (diff) | |
parent | bd71c2b17468a2531fb4c81ec1d73520845e97e1 (diff) | |
download | op-kernel-dev-e601ef22bc5ec9332c8d785533895ee81c834b8a.zip op-kernel-dev-e601ef22bc5ec9332c8d785533895ee81c834b8a.tar.gz |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/asm-ia64/machvec_sn2.h')
-rw-r--r-- | include/asm-ia64/machvec_sn2.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-ia64/machvec_sn2.h b/include/asm-ia64/machvec_sn2.h index e1b6cd63..03d00fa 100644 --- a/include/asm-ia64/machvec_sn2.h +++ b/include/asm-ia64/machvec_sn2.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2003 Silicon Graphics, Inc. All Rights Reserved. + * Copyright (c) 2002-2003, 2006 Silicon Graphics, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License @@ -20,11 +20,6 @@ * License along with this program; if not, write the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * - * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, - * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * * For further information regarding this notice, see: * * http://oss.sgi.com/projects/GenInfo/NoticeExplan |