Commit e370ad03 authored by Bartłomiej Grzesik's avatar Bartłomiej Grzesik
Browse files

ANDROID: Merge android16-6.12-kminext into android16-6.12 am: e7ac44a8

Original change: https://android-review.googlesource.com/c/kernel/common/+/3831775



[bgrzesik]: Resolved conflicts in drivers/usb/typec/class.c
[bgrzesik]: Updated ABI for aarch64
[bgrzesik]: Updated ABI for x86_64

Bug: 456859085
Upstream-Task: Bypass-Upstream-Divergence-Tracking
Change-Id: I52e1618dadfd2ebadd21fa90b3634c99b6f9e501
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Signed-off-by: default avatarBartłomiej Grzesik <bgrzesik@google.com>
parents 43ce0f84 e7ac44a8
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment