Documentation/nfc/nfc-hci.txt
0 → 100644
+155
−0
+10
−17
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem Conflicts: drivers/net/wireless/iwlwifi/iwl-testmode.c include/net/nfc/nfc.h net/nfc/netlink.c net/wireless/nl80211.c