Merge branch 'android14-5.15' into amlogic-5.15-dev [1/1]

PD#SWPL-87897

Problem:
record merge upstream information

Solution:
AML_KERNEL_VERSION      12
UPSTREAM_VERSION        "2447b4c0a5ca8"
AML_PATCH_VERSION       "2447b4c0a5ca8"
MERGE_DATE              "2024-08-02"

Verify:
sc2

Change-Id: I69f8a7d5d122dec79a63283b9def5eea59a50559
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
This commit is contained in:
Wanwei Jiang
2023-02-07 17:19:36 +08:00
committed by Dongjin Kim
parent d7f442ce10
commit db29afc2d5

View File

@@ -0,0 +1,14 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
/*
* Copyright (c) 2019 Amlogic, Inc. All rights reserved.
*/
#ifndef _LINUX_UPSTREAM_VERSION_H
#define _LINUX_UPSTREAM_VERSION_H
#define AML_KERNEL_VERSION 12
#define UPSTREAM_VERSION "2447b4c0a5ca8"
#define AML_PATCH_VERSION "2447b4c0a5ca8"
#define MERGE_DATE "2024-08-02"
#endif