You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		13 years ago
..
Kconfig	batman-adv: add bridge loop avoidance compile option	13 years ago
Makefile	batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h}	13 years ago
bat_algo.h	batman-adv: Reformat multiline comments to consistent style	13 years ago
bat_iv_ogm.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	13 years ago
bitarray.c	batman-adv: Prefix types structs with batadv_	13 years ago
bitarray.h	batman-adv: make batadv_test_bit() return 0 or 1 only	13 years ago
bridge_loop_avoidance.c	batman-adv: Reduce accumulated length of simple statements	13 years ago
bridge_loop_avoidance.h	batman-adv: Add the backbone gateway list to debugfs	13 years ago
debugfs.c	batman-adv: Add the backbone gateway list to debugfs	13 years ago
debugfs.h	batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h}	13 years ago
gateway_client.c	batman-adv: Reduce accumulated length of simple statements	13 years ago
gateway_client.h	batman-adv: Prefix types structs with batadv_	13 years ago
gateway_common.c	batman-adv: Prefix types structs with batadv_	13 years ago
gateway_common.h	batman-adv: Prefix gateway enum with BATADV_	13 years ago
hard-interface.c	batman-adv: Split batadv_priv in sub-structures for features	13 years ago
hard-interface.h	batman-adv: Prefix types structs with batadv_	13 years ago
hash.c	batman-adv: Remove space before semicolon	13 years ago
hash.h	net: Fix (nearly-)kernel-doc comments for various functions	13 years ago
icmp_socket.c	batman-adv: Prefix types structs with batadv_	13 years ago
icmp_socket.h	batman-adv: Prefix types structs with batadv_	13 years ago
main.c	batman-adv: Split batadv_priv in sub-structures for features	13 years ago
main.h	batman-adv: Start new development cycle	13 years ago
originator.c	batman-adv: Fix alignment after opened parentheses	13 years ago
originator.h	batman-adv: Prefix types structs with batadv_	13 years ago
packet.h	batman-adv: detect not yet announced clients	13 years ago
ring_buffer.c	batman-adv: Prefix main defines with BATADV_	13 years ago
ring_buffer.h	batman-adv: Reformat multiline comments to consistent style	13 years ago
routing.c	batman-adv: change interface_rx to get orig node	13 years ago
routing.h	batman-adv: Prefix types structs with batadv_	13 years ago
send.c	batman-adv: Don't break statements after assignment operator	13 years ago
send.h	batman-adv: Prefix types structs with batadv_	13 years ago
soft-interface.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	13 years ago
soft-interface.h	batman-adv: change interface_rx to get orig node	13 years ago
sysfs.c	batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h}	13 years ago
sysfs.h	batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h}	13 years ago
translation-table.c	batman-adv: detect not yet announced clients	13 years ago
translation-table.h	batman-adv: detect not yet announced clients	13 years ago
types.h	batman-adv: detect not yet announced clients	13 years ago
unicast.c	batman-adv: Reduce accumulated length of simple statements	13 years ago
unicast.h	batman-adv: Prefix types structs with batadv_	13 years ago
vis.c	batman-adv: Reduce accumulated length of simple statements	13 years ago
vis.h	batman-adv: fix typos in comments	13 years ago