Merge branch 'master' into upstream

[linux-2.6] / drivers / net / e1000 / Makefile

diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile
index 92823ac89d4263f955c1a592a806b1ab75c82cad..5dea2b7dea4d6b9118f4ad9426ea7093058779e7 100644 (file)
--- a/drivers/net/e1000/Makefile
+++ b/drivers/net/e1000/Makefile
@@ -1,7 +1,7 @@
 ################################################################################
 #
 # 
-# Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+# Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify it 
 # under the terms of the GNU General Public License as published by the Free