mirror of
https://github.com/Evolution-X-Devices/kernel_google_b1c1
synced 2026-02-09 19:09:19 +00:00
Conflicts: net/bluetooth/l2cap_core.c Just two overlapping changes, one added an initialization of a local variable, and another change added a new local variable. Signed-off-by: David S. Miller <davem@davemloft.net>