Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/net/batman-adv
History
David S. Miller 4180442058 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	net/ipv4/tcp_metrics.c

Overlapping changes between the "don't create two tcp metrics objects
with the same key" race fix in net and the addition of the destination
address in the lookup key in net-next.

Minor overlapping changes in bnx2x driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-18 00:55:41 -08: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: use consistent kerneldoc style 2014-01-16 00:16:00 +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 batman-adv: update copyright years for 2014 2014-01-12 14:41:19 +01: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: use __dev_get_by_index instead of dev_get_by_index to find interface 2014-01-14 18:50:47 -08: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: update copyright years for 2014 2014-01-12 14:41:19 +01:00
originator.h batman-adv: update copyright years for 2014 2014-01-12 14:41:19 +01:00
packet.h batman-adv: update copyright years for 2014 2014-01-12 14:41:19 +01:00
routing.c batman-adv: update copyright years for 2014 2014-01-12 14:41:19 +01:00
routing.h batman-adv: update copyright years for 2014 2014-01-12 14:41:19 +01:00
send.c batman-adv: update copyright years for 2014 2014-01-12 14:41:19 +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: use consistent kerneldoc style 2014-01-16 00:16:00 +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