David S. Miller 04c9f416e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/batman-adv/bridge_loop_avoidance.c net/batman-adv/bridge_loop_avoidance.h net/batman-adv/soft-interface.c net/mac80211/mlme.c With merge help from Antonio Quartulli (batman-adv) and Stephen Rothwell (drivers/net/usb/qmi_wwan.c). The net/mac80211/mlme.c conflict seemed easy enough, accounting for a conversion to some new tracing macros. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-07-10 23:56:33 -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-07-10 23:56:33 -07:00
nci	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07: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	net: Use NLMSG_DEFAULT_SIZE in combination with nlmsg_new()	2012-06-28 17:56:43 -07: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