Commit dfed1574 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
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

Change-Id: I1a0d7a30074e2532f53b9c9d4cf0e8346d57ffef
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
[Re-resolved rust/kernel/types.rs <mmaurer@google.com>]
Signed-off-by: default avatarMatthew Maurer <mmaurer@google.com>
parent 2419132b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment