Skip to content
Snippets Groups Projects
Commit 85c4efbe authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge v6.12-rc6 into usb-next 


We need the USB fixes in here as well, and this resolves a merge
conflict in:
	drivers/usb/typec/tcpm/tcpm.c

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20241101150730.090dc30f@canb.auug.org.au


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents bf373d29 59b723cd
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 323 additions and 215 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment