diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-02-07 10:00:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-02-07 10:00:41 +0100 |
| commit | 52fce956a7568504a1da90c14b9bf2deaad401bd (patch) | |
| tree | 5f9ed93cbdfa8f8356fc0daea8fa2da07eeae7bd /drivers/infiniband/hw/nes/nes_mgt.h | |
| parent | 290436c9c61ac983b1bd425da67242a4357c7701 (diff) | |
| parent | 9dac6a29e0ce0cd9dec497baa123e216b00b525d (diff) | |
| download | blackbird-obmc-linux-52fce956a7568504a1da90c14b9bf2deaad401bd.tar.gz blackbird-obmc-linux-52fce956a7568504a1da90c14b9bf2deaad401bd.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
perf/core fixes and improvements.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_mgt.h')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_mgt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_mgt.h b/drivers/infiniband/hw/nes/nes_mgt.h index 8c8af254555a..4f7f701c4a81 100644 --- a/drivers/infiniband/hw/nes/nes_mgt.h +++ b/drivers/infiniband/hw/nes/nes_mgt.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2010 Intel-NE, Inc. All rights reserved. +* Copyright (c) 2006 - 2011 Intel-NE, 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 |
