e11c259f74
Conflicts: include/net/bluetooth/bluetooth.h |
||
---|---|---|
.. | ||
nci | ||
af_nfc.c | ||
core.c | ||
Kconfig | ||
Makefile | ||
netlink.c | ||
nfc.h | ||
rawsock.c |
e11c259f74
Conflicts: include/net/bluetooth/bluetooth.h |
||
---|---|---|
.. | ||
nci | ||
af_nfc.c | ||
core.c | ||
Kconfig | ||
Makefile | ||
netlink.c | ||
nfc.h | ||
rawsock.c |