diff options
author | David S. Miller <davem@davemloft.net> | 2010-11-17 18:56:04 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-17 18:56:04 +0100 |
commit | a1082bfe7d2d88d9626f5542dda9c0781394e91f (patch) | |
tree | 5bf2c1084bc9ed223a35d1bcd1f494185c1d48e0 /drivers/net/igbvf/defines.h | |
parent | mpc52xx: cleanup locking (diff) | |
parent | e1000e: add netpoll support for MSI/MSI-X IRQ modes (diff) | |
download | linux-a1082bfe7d2d88d9626f5542dda9c0781394e91f.tar.xz linux-a1082bfe7d2d88d9626f5542dda9c0781394e91f.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/igbvf/defines.h')
-rw-r--r-- | drivers/net/igbvf/defines.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/igbvf/defines.h b/drivers/net/igbvf/defines.h index 88a47537518a..79f2604673fe 100644 --- a/drivers/net/igbvf/defines.h +++ b/drivers/net/igbvf/defines.h @@ -1,7 +1,7 @@ /******************************************************************************* Intel(R) 82576 Virtual Function Linux driver - Copyright(c) 1999 - 2009 Intel Corporation. + Copyright(c) 1999 - 2010 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, |