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

Merge 534066a9 (".gitignore: ignore *.cover and *.mbx") into android-mainline 



Steps on the way to 6.3-rc1

Resolves merge conflicts in:
	arch/arm/mach-s3c/Makefile

Change-Id: Ie0c4435609440f1c7f68d0de9cc5d935cd09eaae
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 2eaab0b6 534066a9
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