Merge branch 'fix/hda' into for-linus

[sfrench/cifs-2.6.git] / drivers / infiniband / hw / nes / nes_context.h

diff --git a/drivers/infiniband/hw/nes/nes_context.h b/drivers/infiniband/hw/nes/nes_context.h
index 0fb8d81d9a621a7050285a28e74f4fb16ddc8bc3..b4393a16099dc69df36fa5f9f2f19d42e2b33d4f 100644 (file)
--- a/drivers/infiniband/hw/nes/nes_context.h
+++ b/drivers/infiniband/hw/nes/nes_context.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2009 Intel-NE, Inc.  All rights reserved.
+ * Copyright (c) 2006 - 2009 Intel Corporation.  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