asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
android_kernel_motorola_sm6225/net/nfc/llcp
History
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
..
commands.c NFC: llcp: Add cleanup support for unreplied SNL requests 2013-03-10 23:16:41 +01:00
Kconfig NFC: Remove CONFIG_EXPERIMENTAL from the LLCP Makefile 2012-10-26 18:26:52 +02:00
llcp.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-07 18:37:01 -04:00
llcp.h NFC: llcp: Add cleanup support for unreplied SNL requests 2013-03-10 23:16:41 +01:00
sock.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-07 18:37:01 -04:00