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

Merge 3662c20e ("net: dsa: b53: fix IP_MULTICAST_CTRL on BCM5325") into android14-6.1-lts



Steps on the way to 6.1.149

Resolves merge conflicts in:
	arch/arm64/mm/fault.c

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