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

Merge branch 'android12-5.4' into branch 'android12-5.4-lts' 



Sync up with android12-5.4 for the following commits:

569d3804 UPSTREAM: usb: common: add function to get interval expressed in us unit
ada4ab68 FROMGIT: Binder: add TF_UPDATE_TXN to replace outdated txn
cc9d67ff BACKPORT: mac80211_hwsim: notify wmediumd of used MAC addresses

Change-Id: I5d9f04c3f5efc433d259834fbb080218541352ae
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b377ca66 569d3804
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