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
..
commands.c	NFC: LLCP's MIUX is 10 bytes long, not 7	2012-06-04 21:34:29 +02:00
Kconfig	NFC: Initial LLCP support	2011-12-14 14:50:13 -05:00
llcp.c	NFC: Destroy LLCP timout workqueue when releasing the link	2012-06-04 21:34:33 +02:00
llcp.h	NFC: Move LLCP MIU extension value to socket structure	2012-06-04 21:34:29 +02:00
sock.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-10 23:56:33 -07:00