FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-17 06:52:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/net/batman-adv
History
David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/bonding/bond_3ad.h
	drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-19 01:24:22 -05:00
..
bat_algo.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
bat_iv_ogm.c
batman-adv: avoid double free when orig_node initialization fails
2014-02-17 17:17:02 +01:00
bitarray.c
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
bitarray.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
bridge_loop_avoidance.c
batman-adv: use consistent kerneldoc style
2014-01-16 00:16:00 +01:00
bridge_loop_avoidance.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
debugfs.c
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
debugfs.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
distributed-arp-table.c
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
distributed-arp-table.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
fragmentation.c
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
fragmentation.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
gateway_client.c
net: remove unnecessary return's
2014-02-13 18:33:38 -05:00
gateway_client.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
gateway_common.c
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
gateway_common.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
hard-interface.c
batman-adv: fix soft-interface MTU computation
2014-02-17 17:17:00 +01:00
hard-interface.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
hash.c
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
hash.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
icmp_socket.c
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
icmp_socket.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
Kconfig
Revert "batman-adv: drop dependency against CRC16"
2014-01-15 16:54:14 -08:00
main.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-01-18 00:55:41 -08:00
main.h
batman-adv: Start new development cycle
2014-01-12 14:41:20 +01:00
Makefile
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
network-coding.c
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
network-coding.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
originator.c
batman-adv: avoid potential race condition when adding a new neighbour
2014-02-17 17:17:01 +01:00
originator.h
batman-adv: avoid potential race condition when adding a new neighbour
2014-02-17 17:17:01 +01:00
packet.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
routing.c
batman-adv: free skb on TVLV parsing success
2014-02-17 17:17:02 +01:00
routing.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
send.c
batman-adv: fix potential kernel paging error for unicast transmissions
2014-02-17 17:17:02 +01:00
send.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
soft-interface.c
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
soft-interface.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
sysfs.c
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
sysfs.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
translation-table.c
batman-adv: fix TT CRC computation by ensuring byte order
2014-02-17 17:17:02 +01:00
translation-table.h
batman-adv: update copyright years for 2014
2014-01-12 14:41:19 +01:00
types.h
batman-adv: use consistent kerneldoc style
2014-01-16 00:16:00 +01:00