linux/net/nfc/llcp
John W. Linville a59f975a78 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
	MAINTAINERS
	drivers/net/wireless/iwlwifi/pcie/trans.c
2012-06-12 14:11:13 -04:00
..
commands.c NFC: LLCP's MIUX is 10 bytes long, not 7 2012-06-04 21:34:29 +02:00
Kconfig
llcp.c NFC: Destroy LLCP timout workqueue when releasing the link 2012-06-04 21:34:33 +02:00
llcp.h NFC: Move LLCP MIU extension value to socket structure 2012-06-04 21:34:29 +02:00
sock.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-06-12 14:11:13 -04:00