312fef7d18
Conflicts: net/bluetooth/l2cap_sock.c net/bluetooth/mgmt.c |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
bnep.h | ||
core.c | ||
netdev.c | ||
sock.c |
312fef7d18
Conflicts: net/bluetooth/l2cap_sock.c net/bluetooth/mgmt.c |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
bnep.h | ||
core.c | ||
netdev.c | ||
sock.c |