Mercurial > hg > truffle
diff src/os_cpu/linux_x86/vm/linux_x86_64.ad @ 1930:2d26b0046e0d
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Tue, 30 Nov 2010 14:53:30 +0100 |
parents | c18cbe5936b8 |
children | 95134e034042 |
line wrap: on
line diff
--- a/src/os_cpu/linux_x86/vm/linux_x86_64.ad Mon Nov 29 18:32:30 2010 +0100 +++ b/src/os_cpu/linux_x86/vm/linux_x86_64.ad Tue Nov 30 14:53:30 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved. +// Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // // This code is free software; you can redistribute it and/or modify it @@ -16,9 +16,9 @@ // 2 along with this work; if not, write to the Free Software Foundation, // Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. // -// Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -// CA 95054 USA or visit www.sun.com if you need additional information or -// have any questions. +// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +// or visit www.oracle.com if you need additional information or have any +// questions. // //