John W. Linville 49c87cd1ea Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ...

Conflicts:
	net/nfc/llcp/llcp.c

2013-03-18 09:39:21 -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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2013-03-18 09:39:21 -04:00

llcp.h

NFC: llcp: Add cleanup support for unreplied SNL requests

2013-03-10 23:16:41 +01:00

sock.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2013-03-18 09:39:21 -04:00