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

Merge 6ab7e1f9 ("setlocalversion: use only the correct release tag for... 


Merge 6ab7e1f9 ("setlocalversion: use only the correct release tag for git-describe") into android-mainline

Steps on the way to 6.3-rc1

Resolves conflicts in:
	scripts/setlocalversion

Change-Id: Ia6ae12860613102cc1b029a872bb7e7c0082c90e
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 976926bb 6ab7e1f9
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