aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbevf/vf.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-11-17 12:56:04 -0500
committerDavid S. Miller <davem@davemloft.net>2010-11-17 12:56:04 -0500
commita1082bfe7d2d88d9626f5542dda9c0781394e91f (patch)
tree5bf2c1084bc9ed223a35d1bcd1f494185c1d48e0 /drivers/net/ixgbevf/vf.h
parent9d1e5e40d6cac4bf7008e04c202d71918455ca11 (diff)
parent147b2c8cb4f3e16aafc87096365a913d01ee3a21 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/ixgbevf/vf.h')
-rw-r--r--drivers/net/ixgbevf/vf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbevf/vf.h b/drivers/net/ixgbevf/vf.h
index 61f9dc831424..144c99d5363a 100644
--- a/drivers/net/ixgbevf/vf.h
+++ b/drivers/net/ixgbevf/vf.h
@@ -1,7 +1,7 @@
1/******************************************************************************* 1/*******************************************************************************
2 2
3 Intel 82599 Virtual Function driver 3 Intel 82599 Virtual Function 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,