diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-02-07 04:00:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-02-07 04:00:41 -0500 |
| commit | 52fce956a7568504a1da90c14b9bf2deaad401bd (patch) | |
| tree | 5f9ed93cbdfa8f8356fc0daea8fa2da07eeae7bd /drivers/infiniband/hw/nes/nes_context.h | |
| parent | 290436c9c61ac983b1bd425da67242a4357c7701 (diff) | |
| parent | 9dac6a29e0ce0cd9dec497baa123e216b00b525d (diff) | |
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_context.h')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_context.h b/drivers/infiniband/hw/nes/nes_context.h index b4393a16099..a69eef16d72 100644 --- a/drivers/infiniband/hw/nes/nes_context.h +++ b/drivers/infiniband/hw/nes/nes_context.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * This software is available to you under a choice of one of two | 4 | * This software is available to you under a choice of one of two |
| 5 | * licenses. You may choose to be licensed under the terms of the GNU | 5 | * licenses. You may choose to be licensed under the terms of the GNU |