David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between 1c385f1fdf ("caif-hsi: Replace platform device with ops structure.") in the net-next tree and commit 39abbaef19 ("caif-hsi: Postpone init of HIS until open()") in the net tree. I did my best with that one and will ask Sjur to check it out. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-28 17:37:00 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07: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
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
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: Return from rawsock_release when sk is NULL	2012-06-26 01:35:26 +02:00