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

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



Steps on the way to 5.10.226

Resolves merge conflicts in:
	drivers/dma-buf/heaps/heap-helpers.c
	drivers/usb/dwc3/core.h
	fs/ext4/inline.c

Change-Id: Id7ab496884e549fc85b6fff8254fb56d6785d78c
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 1f05cd74 0ce9d893
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment