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 /include/zfs/zap_impl.h | |
| 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 'include/zfs/zap_impl.h')
| -rw-r--r-- | include/zfs/zap_impl.h | 14 | 
1 files changed, 1 insertions, 13 deletions
| diff --git a/include/zfs/zap_impl.h b/include/zfs/zap_impl.h index 5d24ab06f..431fd2dbf 100644 --- a/include/zfs/zap_impl.h +++ b/include/zfs/zap_impl.h @@ -2,19 +2,7 @@   *  GRUB  --  GRand Unified Bootloader   *  Copyright (C) 1999,2000,2001,2002,2003,2004  Free Software Foundation, Inc.   * - *  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., 675 Mass Ave, Cambridge, MA 02139, USA. + * SPDX-License-Identifier:	GPL-2.0+   */  /*   * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. |