summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/igbvf/igbvf.h
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-02-24 00:47:05 +0000
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-02-24 00:47:05 +0000
commit8aaaaf3cbfb96a9f74c5775c71067a9290244ec7 (patch)
tree67349c6a69740150b67c4c39de49cde9b3648aa5 /drivers/net/ethernet/intel/igbvf/igbvf.h
parent94f61a7666224ab307e387ff0d146055ae77e6ab (diff)
parente29206381a1436e0f47c0f5b9a23159a03c57715 (diff)
downloadblackbird-op-linux-8aaaaf3cbfb96a9f74c5775c71067a9290244ec7.tar.gz
blackbird-op-linux-8aaaaf3cbfb96a9f74c5775c71067a9290244ec7.zip
Merge branch 'fbdev-for-linus' into fbdev-next
Diffstat (limited to 'drivers/net/ethernet/intel/igbvf/igbvf.h')
-rw-r--r--drivers/net/ethernet/intel/igbvf/igbvf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igbvf/igbvf.h b/drivers/net/ethernet/intel/igbvf/igbvf.h
index fd4a7b780fdd..2c6d87e4d3d9 100644
--- a/drivers/net/ethernet/intel/igbvf/igbvf.h
+++ b/drivers/net/ethernet/intel/igbvf/igbvf.h
@@ -1,7 +1,7 @@
/*******************************************************************************
Intel(R) 82576 Virtual Function Linux driver
- Copyright(c) 2009 - 2010 Intel Corporation.
+ Copyright(c) 2009 - 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,
OpenPOWER on IntegriCloud