Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor SPDX change conflict. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/* adi_64.h: ADI related data structures
|
||||
*
|
||||
* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
|
||||
* Author: Khalid Aziz (khalid.aziz@oracle.com)
|
||||
*
|
||||
* This work is licensed under the terms of the GNU GPL, version 2.
|
||||
*/
|
||||
#ifndef __ASM_SPARC64_ADI_H
|
||||
#define __ASM_SPARC64_ADI_H
|
||||
|
Reference in New Issue
Block a user