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

Merge 0ce9d893 ("clk: ti: dra7-atl: Fix leak of of_nodes") into android13-5.10 



Steps on the way to 5.10.227

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

Change-Id: Idff34d13c7bff58af2287760d26b0f3729023c5c
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b14940b9 0ce9d893
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