diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-31 15:53:43 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-31 15:53:43 +0400 |
| commit | 7bee946358c3cb957d4aa648fc5ab3cad0b232d0 (patch) | |
| tree | 693061ebde2abc35ecc846e5084630d7225aaaff /drivers/infiniband/hw/nes/nes.c | |
| parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
| download | linux-7bee946358c3cb957d4aa648fc5ab3cad0b232d0.tar.xz | |
Merge branch 'linus' into locking-for-linus
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'drivers/infiniband/hw/nes/nes.c')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c index b9611ade9eab..ca599767ffbd 100644 --- a/drivers/infiniband/hw/nes/nes.c +++ b/drivers/infiniband/hw/nes/nes.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006 - 2008 NetEffect, Inc. All rights reserved. + * Copyright (c) 2006 - 2009 Intel-NE, Inc. All rights reserved. * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. * * This software is available to you under a choice of one of two |