mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 15:20:41 +00:00
6fe5468f45
Conflicts: drivers/net/wireless/rt2x00/rt2x00pci.c |
||
---|---|---|
.. | ||
hci | ||
llcp | ||
nci | ||
af_nfc.c | ||
core.c | ||
Kconfig | ||
Makefile | ||
netlink.c | ||
nfc.h | ||
rawsock.c |