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 /fs/zfs/zfs.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 'fs/zfs/zfs.c')
| -rw-r--r-- | fs/zfs/zfs.c | 14 | 
1 files changed, 1 insertions, 13 deletions
| diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c index 1b73244c0..099d51718 100644 --- a/fs/zfs/zfs.c +++ b/fs/zfs/zfs.c @@ -8,19 +8,7 @@   *	Free Software Foundation, Inc.   *	Copyright 2004	Sun Microsystems, Inc.   * - *	GRUB 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. - * - *	GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>. - * + * SPDX-License-Identifier:	GPL-2.0+   */  #include <common.h> |