linux/net/nfc
David S. Miller d978a6361a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/nfc/microread/mei.c
	net/netfilter/nfnetlink_queue_core.c

Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-07 18:37:01 -04:00
..
hci NFC: Initial Secure Element API 2013-01-10 00:51:54 +01:00
llcp Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-07 18:37:01 -04:00
nci NFC: Initial Secure Element API 2013-01-10 00:51:54 +01:00
af_nfc.c
core.c Driver core patches for 3.9-rc1 2013-02-21 12:05:51 -08:00
Kconfig NFC: Remove CONFIG_EXPERIMENTAL 2012-10-26 18:26:52 +02:00
Makefile
netlink.c NFC: llcp: Service Name Lookup netlink interface 2013-03-10 23:14:54 +01:00
nfc.h NFC: llcp: Service Name Lookup netlink interface 2013-03-10 23:14:54 +01:00
rawsock.c NFC: Fix some code style and whitespace issues 2012-10-26 18:26:52 +02:00