diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /drivers/net/ixgbe/ixgbe_82598.c | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
| parent | ab658321f32770b903a4426e2a6fae0392757755 (diff) | |
Merge branch 'master' into percpu
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_82598.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_82598.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_82598.c b/drivers/net/ixgbe/ixgbe_82598.c index 204177d78cec..3103f4165311 100644 --- a/drivers/net/ixgbe/ixgbe_82598.c +++ b/drivers/net/ixgbe/ixgbe_82598.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /******************************************************************************* | 1 | /******************************************************************************* |
| 2 | 2 | ||
| 3 | Intel 10 Gigabit PCI Express Linux driver | 3 | Intel 10 Gigabit PCI Express Linux driver |
| 4 | Copyright(c) 1999 - 2009 Intel Corporation. | 4 | Copyright(c) 1999 - 2010 Intel Corporation. |
| 5 | 5 | ||
| 6 | This program is free software; you can redistribute it and/or modify it | 6 | This program is free software; you can redistribute it and/or modify it |
| 7 | under the terms and conditions of the GNU General Public License, | 7 | under the terms and conditions of the GNU General Public License, |