04c9f416e3
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> |
||
|---|---|---|
| .. | ||
| hci | ||
| llcp | ||
| nci | ||
| af_nfc.c | ||
| core.c | ||
| Kconfig | ||
| Makefile | ||
| netlink.c | ||
| nfc.h | ||
| rawsock.c | ||