mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07: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>