David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/team/team.c drivers/net/usb/qmi_wwan.c net/batman-adv/bat_iv_ogm.c net/ipv4/fib_frontend.c net/ipv4/route.c net/l2tp/l2tp_netlink.c The team, fib_frontend, route, and l2tp_netlink conflicts were simply overlapping changes. qmi_wwan and bat_iv_ogm were of the "use HEAD" variety. With help from Antonio Quartulli. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-28 14:40:49 -04:00
..
bat_algo.h
bat_iv_ogm.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
bitarray.c
bitarray.h	batman-adv: make batadv_test_bit() return 0 or 1 only	2012-09-19 15:49:53 -04:00
bridge_loop_avoidance.c	batman-adv: Reduce accumulated length of simple statements	2012-08-23 14:20:21 +02:00
bridge_loop_avoidance.h	batman-adv: Add the backbone gateway list to debugfs	2012-08-23 14:02:41 +02:00
debugfs.c	batman-adv: Add the backbone gateway list to debugfs	2012-08-23 14:02:41 +02:00
debugfs.h
gateway_client.c	batman-adv: Reduce accumulated length of simple statements	2012-08-23 14:20:21 +02:00
gateway_client.h
gateway_common.c
gateway_common.h
hard-interface.c	batman-adv: Split batadv_priv in sub-structures for features	2012-08-23 14:20:13 +02:00
hard-interface.h
hash.c
hash.h
icmp_socket.c
icmp_socket.h
Kconfig
main.c	batman-adv: Split batadv_priv in sub-structures for features	2012-08-23 14:20:13 +02:00
main.h	batman-adv: Start new development cycle	2012-08-23 14:20:23 +02:00
Makefile
originator.c
originator.h
packet.h	batman-adv: detect not yet announced clients	2012-08-23 14:20:22 +02:00
ring_buffer.c
ring_buffer.h
routing.c	batman-adv: change interface_rx to get orig node	2012-08-23 14:20:22 +02:00
routing.h
send.c	batman-adv: Don't break statements after assignment operator	2012-08-23 14:20:20 +02:00
send.h
soft-interface.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
soft-interface.h	batman-adv: change interface_rx to get orig node	2012-08-23 14:20:22 +02:00
sysfs.c
sysfs.h
translation-table.c	batman-adv: detect not yet announced clients	2012-08-23 14:20:22 +02:00
translation-table.h	batman-adv: detect not yet announced clients	2012-08-23 14:20:22 +02:00
types.h	batman-adv: detect not yet announced clients	2012-08-23 14:20:22 +02:00
unicast.c	batman-adv: Reduce accumulated length of simple statements	2012-08-23 14:20:21 +02:00
unicast.h
vis.c	batman-adv: Reduce accumulated length of simple statements	2012-08-23 14:20:21 +02:00
vis.h	batman-adv: fix typos in comments	2012-08-23 14:02:45 +02:00