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

Merge bceae1da ("x86/traps: Initialize DR6 by writing its architectural...


Merge bceae1da ("x86/traps: Initialize DR6 by writing its architectural reset value") into android15-6.6-lts

Steps on the way to 6.6.97

Resolves merge conflicts in:
	include/net/bluetooth/hci_core.h

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