diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-14 23:19:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-14 23:19:41 -0400 |
| commit | 8fc65162a8f25929be80c8d6321a3479e92b5aae (patch) | |
| tree | cfad5c32408bbdc59a43db16c88f2bea7face7a5 /drivers/net/e1000/e1000_osdep.h | |
| parent | 2acab771b7e676125cb8c96b61dcdefe9ba67e57 (diff) | |
| parent | 99a1f9e88694b406b7c334153bacb56adfcf8388 (diff) | |
Merge branch '7.0.38-k2' of git://66.93.40.222/srv/git/netdev-2.6
Diffstat (limited to 'drivers/net/e1000/e1000_osdep.h')
| -rw-r--r-- | drivers/net/e1000/e1000_osdep.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h index 9790db974dc1..048d052be29d 100644 --- a/drivers/net/e1000/e1000_osdep.h +++ b/drivers/net/e1000/e1000_osdep.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /******************************************************************************* | 1 | /******************************************************************************* |
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved. | 4 | Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved. |
| 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 of the GNU General Public License as published by the Free | 7 | under the terms of the GNU General Public License as published by the Free |
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | Contact Information: | 23 | Contact Information: |
| 24 | Linux NICS <linux.nics@intel.com> | 24 | Linux NICS <linux.nics@intel.com> |
| 25 | e1000-devel Mailing List <e1000-devel@lists.sourceforge.net> | ||
| 25 | Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 | 26 | Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 |
| 26 | 27 | ||
| 27 | *******************************************************************************/ | 28 | *******************************************************************************/ |