Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / intel / ixgbe / Makefile

diff --git a/drivers/net/ethernet/intel/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile
index 7d7387fbdecd33e2c589857cbe5f375b576b0d21..7a16177a12a5c15b298ecd4b0caf19005bd397f2 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/Makefile
+++ b/drivers/net/ethernet/intel/ixgbe/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # Intel 10 Gigabit PCI Express Linux driver
-# Copyright(c) 1999 - 2010 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,