p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/net/batman-adv
History
David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2016-02-23 00:09:14 -05:00
..
Kconfig batman-adv: Switch to HTTPS version of links 2016-02-03 09:54:39 +08:00
Makefile batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
bat_algo.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
bat_iv_ogm.c batman-adv: Convert batadv_hard_iface to kref 2016-02-10 23:24:05 +08:00
bitarray.c batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
bitarray.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
bridge_loop_avoidance.c batman-adv: Convert batadv_bla_claim to kref 2016-02-10 23:24:00 +08:00
bridge_loop_avoidance.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
debugfs.c batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
debugfs.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
distributed-arp-table.c batman-adv: Convert batadv_orig_node to kref 2016-02-10 23:24:06 +08:00
distributed-arp-table.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
fragmentation.c batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
fragmentation.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
gateway_client.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-02-23 00:09:14 -05:00
gateway_client.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
gateway_common.c batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
gateway_common.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
hard-interface.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-02-23 00:09:14 -05:00
hard-interface.h batman-adv: Convert batadv_hard_iface to kref 2016-02-10 23:24:05 +08:00
hash.c batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
hash.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
icmp_socket.c batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
icmp_socket.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
main.c batman-adv: Convert batadv_tvlv_handler to kref 2016-02-10 23:24:03 +08:00
main.h batman-adv: add seqno maximum age and protection start flag parameters 2016-02-10 23:23:57 +08:00
multicast.c batman-adv: Convert batadv_orig_node to kref 2016-02-10 23:24:06 +08:00
multicast.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
network-coding.c batman-adv: Convert batadv_orig_node to kref 2016-02-10 23:24:06 +08:00
network-coding.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
originator.c batman-adv: Convert batadv_orig_node to kref 2016-02-10 23:24:06 +08:00
originator.h batman-adv: Convert batadv_orig_node to kref 2016-02-10 23:24:06 +08:00
packet.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
routing.c batman-adv: Convert batadv_neigh_node to kref 2016-02-10 23:24:04 +08:00
routing.h batman-adv: add seqno maximum age and protection start flag parameters 2016-02-10 23:23:57 +08:00
send.c batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
send.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
soft-interface.c batman-adv: Convert batadv_softif_vlan to kref 2016-02-10 23:23:59 +08:00
soft-interface.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
sysfs.c batman-adv: Convert batadv_softif_vlan to kref 2016-02-10 23:23:59 +08:00
sysfs.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
translation-table.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-02-23 00:09:14 -05:00
translation-table.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
types.h batman-adv: Convert batadv_tt_common_entry to kref 2016-02-10 23:24:06 +08:00