diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-03 11:28:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-03 11:28:35 -0800 |
| commit | a45d49d1053fd5954260a70e555daabd5672577d (patch) | |
| tree | 042d1421b20d6437884c4f0311e5a69caf6d959c /drivers/net/ixgbe/ixgbe_dcb.c | |
| parent | e066008b38ca9ace1b6de8dbbac8ed460640791d (diff) | |
| parent | a52055e055f5b551c0814c4381e43b204f9db777 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_dcb.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_dcb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ixgbe/ixgbe_dcb.c index 13c962efbfc..c2ee6fcb4e9 100644 --- a/drivers/net/ixgbe/ixgbe_dcb.c +++ b/drivers/net/ixgbe/ixgbe_dcb.c @@ -1,7 +1,7 @@ /******************************************************************************* Intel 10 Gigabit PCI Express Linux driver - Copyright(c) 1999 - 2010 Intel Corporation. + Copyright(c) 1999 - 2011 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License, |