diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-07-25 17:57:46 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-07-25 17:57:46 +0200 | 
| commit | 8b485ba12b0defa0c4ed3559789250238f8331a8 (patch) | |
| tree | a1174810bef0d504370272918dca8d485ae2ae3b /drivers/net/e1000.c | |
| parent | 12607adcd5181a8f6eab885a5fe4ba2fa12ef92a (diff) | |
| parent | aaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c (diff) | |
| download | olio-uboot-2014.01-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.xz olio-uboot-2014.01-8b485ba12b0defa0c4ed3559789250238f8331a8.zip | |
Merge branch 'u-boot/master' into u-boot-arm/master
Diffstat (limited to 'drivers/net/e1000.c')
| -rw-r--r-- | drivers/net/e1000.c | 17 | 
1 files changed, 1 insertions, 16 deletions
| diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index c1863f4bb..57aa53dba 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -9,22 +9,7 @@ tested on both gig copper and gig fiber boards    Copyright(c) 1999 - 2002 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 -  Software Foundation; either version 2 of the License, or (at your option) -  any later version. - -  This program is distributed in the hope that it will be useful, but WITHOUT -  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for -  more details. - -  You should have received a copy of the GNU General Public License along with -  this program; if not, write to the Free Software Foundation, Inc., 59 -  Temple Place - Suite 330, Boston, MA	02111-1307, USA. - -  The full GNU General Public License is included in this distribution in the -  file called LICENSE. + * SPDX-License-Identifier:	GPL-2.0+    Contact Information:    Linux NICS <linux.nics@intel.com> |