Commit 09c164d0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge be420222 ("Merge tag 'x86_tdx_for_6.13-rc1' of... 

Merge be420222 ("Merge tag 'x86_tdx_for_6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip"

) into android-mainline

Steps on the way to 6.13-rc1

Resolves merge conflicts in:
	drivers/dma-buf/heaps/system_heap.c

Change-Id: I0c7b21011c91b3bd28712ed5c8170eaca016d06d
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents bf6f279e be420222
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