diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 10:36:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 10:36:48 -0700 |
| commit | a78b3371b628559eb5c46ee1518df27c62f3e801 (patch) | |
| tree | dd32333307ce6a7e4d39ea8c07c34bc3dc5540a1 /drivers/infiniband/core/device.c | |
| parent | 97c169a21bfb5bb2ab2bccd852da4f0d0e021c55 (diff) | |
| parent | a4d61e84804f3b14cc35c5e2af768a07c0f64ef6 (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
Diffstat (limited to 'drivers/infiniband/core/device.c')
| -rw-r--r-- | drivers/infiniband/core/device.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index 9197e92d708..d3cf84e0158 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2004 Topspin Communications. All rights reserved. + * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU |