You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		13 years ago
..
hci	NFC: Introduce target mode tx ops	13 years ago
llcp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	13 years ago
nci	NFC: Introduce target mode tx ops	13 years ago
Kconfig	NFC: HCI support	13 years ago
Makefile	NFC: HCI support	13 years ago
af_nfc.c	…
core.c	NFC: Call the DEP link down ops even when in target mode	13 years ago
netlink.c	NFC: Switch to Initiator mode when getting NFC_ATTR_PROTOCOLS	13 years ago
nfc.h	NFC: Introduce target mode rx data callback	13 years ago
rawsock.c	NFC: Fix next target_idx type and rename for clarity	13 years ago