projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/update-bits' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
staging
/
lustre
/
lustre
/
llite
/
vvp_lock.c
diff --git
a/drivers/staging/lustre/lustre/llite/vvp_lock.c
b/drivers/staging/lustre/lustre/llite/vvp_lock.c
index
f7b1144
..
ff09480
100644
(file)
--- a/
drivers/staging/lustre/lustre/llite/vvp_lock.c
+++ b/
drivers/staging/lustre/lustre/llite/vvp_lock.c
@@
-26,6
+26,8
@@
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2014, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/