diff options
| author | Greg Kroah-Hartman | 2012-03-09 21:35:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-03-09 21:35:53 +0100 |
| commit | 263a5c8e16c34199ddf6de3f102e789ffa3ee26e (patch) | |
| tree | 4f049e339d522b2ab0ba3bed3ec217e4bbc83d35 /drivers/net/ethernet/intel/ixgbevf/ethtool.c | |
| parent | Revert "sysfs: Kill nlink counting." (diff) | |
| parent | Linux 3.3-rc6 (diff) | |
| download | kernel-qcow2-linux-263a5c8e16c34199ddf6de3f102e789ffa3ee26e.tar.gz kernel-qcow2-linux-263a5c8e16c34199ddf6de3f102e789ffa3ee26e.tar.xz kernel-qcow2-linux-263a5c8e16c34199ddf6de3f102e789ffa3ee26e.zip | |
Merge 3.3-rc6 into driver-core-next
This was done to resolve a conflict in the drivers/base/cpu.c file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbevf/ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c index c85700318147..2bfe0d1d7958 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c +++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c @@ -1,7 +1,7 @@ /******************************************************************************* Intel 82599 Virtual Function driver - Copyright(c) 1999 - 2009 Intel Corporation. + Copyright(c) 1999 - 2012 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, |