X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flov%2Flov_merge.c;h=4b9b1a504d7851f952a0587c0431150bcb28a3ca;hb=08aa217ce49aba1ded52e0f7adb8a607035123fd;hp=8ba1e1a66073279ff8a7f36b2b341d82711830b3;hpb=317ebf88af58e9d9235c90f84b112e931ae69b43;p=fs%2Flustre-release.git diff --git a/lustre/lov/lov_merge.c b/lustre/lov/lov_merge.c index 8ba1e1a..4b9b1a5 100644 --- a/lustre/lov/lov_merge.c +++ b/lustre/lov/lov_merge.c @@ -26,6 +26,8 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/