kernel-ark/net/nfc
David S. Miller 43b03f1f6d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	MAINTAINERS
	drivers/net/wireless/iwlwifi/pcie/trans.c

The iwlwifi conflict was resolved by keeping the code added
in 'net' that turns off the buggy chip feature.

The MAINTAINERS conflict was merely overlapping changes, one
change updated all the wireless web site URLs and the other
changed some GIT trees to be Johannes's instead of John's.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-12 21:59:18 -07:00
..
hci NFC: Introduce target mode tx ops 2012-06-04 21:34:30 +02:00
llcp Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-12 21:59:18 -07: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