David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: include/net/inetpeer.h net/ipv6/output_core.c Changes in net were fixing bugs in code removed in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-06-03 23:32:12 -07:00
..
Kconfig	batman-adv: Multicast Listener Announcements via Translation Table	2014-03-22 09:18:56 +01:00
Makefile	batman-adv: Multicast Listener Announcements via Translation Table	2014-03-22 09:18:56 +01: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: fix neigh_ifinfo imbalance	2014-05-10 10:58:42 +02: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: prefer ether_addr_copy to memcpy	2014-03-22 08:50:26 +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: remove semi-colon after macro definition	2014-05-18 15:04:00 +02:00
debugfs.h	batman-adv: update copyright years for 2014	2014-01-12 14:41:19 +01:00
distributed-arp-table.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
distributed-arp-table.h	batman-adv: improve DAT documentation	2014-03-22 09:18:59 +01:00
fragmentation.c	batman-adv: fix reference counting imbalance while sending fragment	2014-05-15 20:03:17 +02:00
fragmentation.h	batman-adv: update copyright years for 2014	2014-01-12 14:41:19 +01:00
gateway_client.c	batman-adv: increase orig refcount when storing ref in gw_node	2014-05-15 20:03:17 +02: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: fix a bogus warning from batadv_is_on_batman_iface()	2014-05-22 17:23:00 -04: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: prefer ether_addr_copy to memcpy	2014-03-22 08:50:26 +01:00
icmp_socket.h	batman-adv: update copyright years for 2014	2014-01-12 14:41:19 +01:00
main.c	batman-adv: Send multicast packets to nodes with a WANT_ALL flag	2014-03-22 09:18:58 +01:00
main.h	batman-adv: Start new development cycle	2014-05-18 15:04:00 +02:00
multicast.c	batman-adv: fix NULL pointer dereferences	2014-05-31 10:07:14 +02:00
multicast.h	batman-adv: Modified forwarding behaviour for multicast packets	2014-03-22 09:18:57 +01:00
network-coding.c	batman-adv: add blank line between declarations and the rest of the code	2014-05-18 15:03:52 +02:00
network-coding.h	batman-adv: update copyright years for 2014	2014-01-12 14:41:19 +01:00
originator.c	batman-adv: fix indirect hard_iface NULL dereference	2014-05-15 20:03:16 +02: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: improve the TT flags documentation	2014-03-22 09:18:59 +01:00
routing.c	batman-adv: prefer ether_addr_copy to memcpy	2014-03-22 08:50:26 +01:00
routing.h	batman-adv: update copyright years for 2014	2014-01-12 14:41:19 +01:00
send.c	batman-adv: Send multicast packets to nodes with a WANT_ALL flag	2014-03-22 09:18:58 +01:00
send.h	batman-adv: Modified forwarding behaviour for multicast packets	2014-03-22 09:18:57 +01:00
soft-interface.c	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
soft-interface.h	batman-adv: update copyright years for 2014	2014-01-12 14:41:19 +01:00
sysfs.c	batman-adv: remove semi-colon after macro definition	2014-05-18 15:04:00 +02:00
sysfs.h	batman-adv: update copyright years for 2014	2014-01-12 14:41:19 +01:00
translation-table.c	batman-adv: Modified forwarding behaviour for multicast packets	2014-03-22 09:18:57 +01:00
translation-table.h	batman-adv: Modified forwarding behaviour for multicast packets	2014-03-22 09:18:57 +01:00
types.h	batman-adv: improve DAT documentation	2014-03-22 09:18:59 +01:00