David S. Miller a06ee256e5 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Version bump conflict in batman-adv, take what's in net-next. iavf conflict, adjustment of netdev_ops in net-next conflicting with poll controller method removal in net. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-09-25 10:35:29 -07:00
..
hci	NFC: Fix possible memory corruption when handling SHDLC I-Frame commands	2018-09-18 19:55:01 -07:00
nci	net: nci: remove redundant null pointer check before kfree_skb	2018-09-21 09:04:37 -07:00
Kconfig	NFC Digital: Add NFC-F technology support	2013-09-25 02:02:25 +02:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
af_nfc.c	net: socket: mark socket protocol handler structs as const	2017-05-16 11:54:07 -04:00
core.c	NFC: Convert timers to use timer_setup()	2017-11-06 01:12:10 +01:00
digital.h	NFC: digital: Add 'tg_listen_md' and 'tg_get_rf_tech' driver hooks	2014-07-23 01:17:31 +02:00
digital_core.c	NFC: digital: Abort cmd when deactivating target	2017-11-10 00:03:39 +01:00
digital_dep.c	NFC: digital: NFC-DEP Target WT(nfcdep,max) is now 14	2017-06-23 00:19:59 +02:00
digital_technology.c	NFC: digital: NFC-A SEL_RES must be one byte	2017-06-23 00:19:59 +02:00
llcp.h	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
llcp_commands.c	net/nfc: Avoid stalls when nfc_alloc_send_skb() returned NULL.	2018-07-18 10:51:45 -07:00
llcp_core.c	NFC: Convert timers to use timer_setup()	2017-11-06 01:12:10 +01:00
llcp_sock.c	net: simplify sock_poll_wait	2018-07-30 09:10:25 -07:00
netlink.c	net: remove unnecessary genlmsg_cancel() calls	2018-05-29 09:53:38 -04:00
nfc.h	nfc: netlink: HCI event connectivity implementation	2015-12-29 19:06:20 +01:00
rawsock.c	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00