summaryrefslogtreecommitdiffstats
path: root/drivers/net/mlx4/alloc.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-11 12:57:01 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-11 12:57:01 +0200
commit6de9c70882ecdee63a652d493bf2353963bd4c22 (patch)
tree9d219e705492331c97f5f7dccce3b0b1a29251bf /drivers/net/mlx4/alloc.c
parentd406d21d90dce2e66c7eb4a44605aac947fe55fb (diff)
parent796aadeb1b2db9b5d463946766c5bbfd7717158c (diff)
downloadkernel-crypto-6de9c70882ecdee63a652d493bf2353963bd4c22.tar.gz
kernel-crypto-6de9c70882ecdee63a652d493bf2353963bd4c22.tar.xz
kernel-crypto-6de9c70882ecdee63a652d493bf2353963bd4c22.zip
Merge branch 'linus' into x86/cleanups
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 f9d6b4dca18..096bca54bcf 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