diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-01 12:24:04 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-01 12:24:04 -0800 |
commit | 9836f4080fd5b680cc2d9656355c1a7c681b1ffd (patch) | |
tree | e65c4386dbeb125891b06b01be107323e176ac7f /drivers/net/sfc/tx.c | |
parent | e364a3416d81c7717dd642dc9b3ab132b7885f66 (diff) | |
parent | 6d84b986b26bac1d4d678ff10c10a633bf53f834 (diff) | |
download | op-kernel-dev-9836f4080fd5b680cc2d9656355c1a7c681b1ffd.zip op-kernel-dev-9836f4080fd5b680cc2d9656355c1a7c681b1ffd.tar.gz |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
Diffstat (limited to 'drivers/net/sfc/tx.c')
-rw-r--r-- | drivers/net/sfc/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c index 1a51653..1398019 100644 --- a/drivers/net/sfc/tx.c +++ b/drivers/net/sfc/tx.c @@ -1,7 +1,7 @@ /**************************************************************************** * Driver for Solarflare Solarstorm network controllers and boards * Copyright 2005-2006 Fen Systems Ltd. - * Copyright 2005-2009 Solarflare Communications Inc. + * Copyright 2005-2010 Solarflare Communications Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published |