summaryrefslogtreecommitdiff
path: root/drivers/net/mlx4/alloc.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-22 15:08:57 +0400
committerIngo Molnar <mingo@elte.hu>2008-09-22 15:08:57 +0400
commit0b88641f1bafdbd087d5e63987a30cc0eadd63b9 (patch)
tree81dcf756db373444140bb2623584710c628e3048 /drivers/net/mlx4/alloc.c
parentfbdbf709938d155c719c76b9894d28342632c797 (diff)
parent72d31053f62c4bc464c2783974926969614a8649 (diff)
downloadlinux-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.tar.xz
Merge commit 'v2.6.27-rc7' into x86/debug
Diffstat (limited to 'drivers/net/mlx4/alloc.c')
-rw-r--r--drivers/net/mlx4/alloc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c
index f9d6b4dca180..096bca54bcf7 100644
--- a/drivers/net/mlx4/alloc.c
+++ b/drivers/net/mlx4/alloc.c
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2007, 2008 Mellanox Technologies. 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