Commit 4b79b7b4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Lee Jones
Browse files

Merge 1ef4cf5f ("rust: alloc: update module comment of alloc.rs") into android16-6.12 



Steps on the way to 6.12.18

Resolves merge conflicts in:
	rust/kernel/types.rs
	scripts/Makefile.build
again...

Change-Id: If08d5063d461dad8f94d88e87564fe93a67fdcb3
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 0aa0e7b7 1ef4cf5f
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