diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2019-06-25 08:42:25 -0500 | 
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-06-25 08:42:25 -0500 | 
| commit | d7929c1e13e3788e7cb741d75b5baec5e53eff21 (patch) | |
| tree | cf513071edfc4499b4e025e4846244c9d0e4c6bd /tools/perf/scripts/perl/Perf-Trace-Util/Context.c | |
| parent | 8ac875db0fdc1cfa55c424b38a81cf5282f3df0b (diff) | |
| parent | 80d42db02b3a5beb8cffba08207adf5f4c525ee3 (diff) | |
Merge branch 'drm-next' into drm-next-5.3
Backmerge drm-next and fix up conflicts due to drmP.h removal.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'tools/perf/scripts/perl/Perf-Trace-Util/Context.c')
| -rw-r--r-- | tools/perf/scripts/perl/Perf-Trace-Util/Context.c | 17 | 
1 files changed, 1 insertions, 16 deletions
diff --git a/tools/perf/scripts/perl/Perf-Trace-Util/Context.c b/tools/perf/scripts/perl/Perf-Trace-Util/Context.c index 28431d1bbcf5..ead521dd8d79 100644 --- a/tools/perf/scripts/perl/Perf-Trace-Util/Context.c +++ b/tools/perf/scripts/perl/Perf-Trace-Util/Context.c @@ -1,9 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later  /*   * This file was generated automatically by ExtUtils::ParseXS version 2.18_02 from the   * contents of Context.xs. Do not edit this file, edit Context.xs instead.   *   *	ANY CHANGES MADE HERE WILL BE LOST!  - *   */  #include <stdbool.h>  #ifndef HAS_BOOL @@ -14,21 +14,6 @@   * Context.xs.  XS interfaces for perf script.   *   * Copyright (C) 2009 Tom Zanussi <tzanussi@gmail.com> - * - *  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 - *   */  #include "EXTERN.h"  | 
