Merge tag 'v5.2-rc6' into sched/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -1,11 +1,8 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* (c) Copyright 2003, 2006 Hewlett-Packard Development Company, L.P.
|
||||
* Alex Williamson <alex.williamson@hp.com>
|
||||
* Bjorn Helgaas <bjorn.helgaas@hp.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
@@ -1,3 +1,4 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* arch/ia64/kernel/machine_kexec.c
|
||||
*
|
||||
@@ -5,9 +6,6 @@
|
||||
* Copyright (C) 2005 Hewlett-Packard Development Comapny, L.P.
|
||||
* Copyright (C) 2005 Khalid Aziz <khalid.aziz@hp.com>
|
||||
* Copyright (C) 2006 Intel Corp, Zou Nan hai <nanhai.zou@intel.com>
|
||||
*
|
||||
* This source code is licensed under the GNU General Public License,
|
||||
* Version 2. See the file COPYING for more details.
|
||||
*/
|
||||
|
||||
#include <linux/mm.h>
|
||||
|
@@ -1,3 +1,4 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* arch/ia64/kernel/relocate_kernel.S
|
||||
*
|
||||
@@ -6,9 +7,6 @@
|
||||
* Copyright (C) 2005 Hewlett-Packard Development Company, L.P.
|
||||
* Copyright (C) 2005 Khalid Aziz <khalid.aziz@hp.com>
|
||||
* Copyright (C) 2005 Intel Corp, Zou Nan hai <nanhai.zou@intel.com>
|
||||
*
|
||||
* This source code is licensed under the GNU General Public License,
|
||||
* Version 2. See the file COPYING for more details.
|
||||
*/
|
||||
#include <asm/asmmacro.h>
|
||||
#include <asm/kregs.h>
|
||||
|
Reference in New Issue
Block a user