Commit 0597dfed authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge ec31f868 ("setlocalversion: absorb $(KERNELVERSION)") into android-mainline 



Steps on the way to 6.3-rc1

Resolves merge conflicts in:
	Makefile
	scripts/setlocalversion

Change-Id: I69823ed94cef4090b6d21118ade72cf47e9f07ee
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 2f021aeb ec31f868
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment