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

..

hci

NFC: Introduce target mode tx ops

2012-06-04 21:34:30 +02:00

llcp

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

2012-06-12 14:11:13 -04:00

nci

NFC: Introduce target mode tx ops

2012-06-04 21:34:30 +02:00

af_nfc.c

NFC: Core code identation fixes

2012-03-06 15:16:25 -05:00

core.c

NFC: Call the DEP link down ops even when in target mode

2012-06-04 21:34:31 +02:00

Kconfig

NFC: HCI support

2012-04-12 15:10:34 -04:00

Makefile

NFC: HCI support

2012-04-12 15:10:34 -04:00

netlink.c

NFC: Switch to Initiator mode when getting NFC_ATTR_PROTOCOLS

2012-06-04 21:34:33 +02:00

nfc.h

NFC: Introduce target mode rx data callback

2012-06-04 21:34:31 +02:00

rawsock.c

NFC: Fix next target_idx type and rename for clarity

2012-04-12 15:10:37 -04:00