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

Merge 126be034 ("riscv: misaligned: Add handling for ZCB instructions") into android16-6.12-lts



Steps on the way to 6.12.29

Resolves merge conflicts in:
	drivers/usb/dwc3/core.h

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