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 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c drivers/net/ethernet/emulex/benet/be.h include/net/tcp.h net/mac802154/mac802154.h Most conflicts were minor overlapping stuff. The be2net driver brought in some fixes that added __vlan_put_tag calls, which in net-next take an additional argument. Signed-off-by: David S. Miller <davem@davemloft.net>		12 years ago
..
Kconfig	batman-adv: network coding - add the initial infrastructure code	12 years ago
Makefile	batman-adv: update Makefile copyright years	12 years ago
bat_algo.h	batman-adv: update copyright years	12 years ago
bat_iv_ogm.c	batman-adv: network coding - detect coding nodes and remove these after timeout	12 years ago
bitarray.c	batman-adv: update copyright years	12 years ago
bitarray.h	batman-adv: update copyright years	12 years ago
bridge_loop_avoidance.c	net: vlan: add protocol argument to packet tagging functions	12 years ago
bridge_loop_avoidance.h	batman-adv: update copyright years	12 years ago
debugfs.c	batman-adv: network coding - detect coding nodes and remove these after timeout	12 years ago
debugfs.h	batman-adv: update copyright years	12 years ago
distributed-arp-table.c	batman-adv: replace redundant primary_if_get calls	12 years ago
distributed-arp-table.h	batman-adv: update copyright years	12 years ago
gateway_client.c	batman-adv: use seq_puts instead of seq_printf when the format is constant	12 years ago
gateway_client.h	batman-adv: update copyright years	12 years ago
gateway_common.c	batman-adv: update copyright years	12 years ago
gateway_common.h	batman-adv: update copyright years	12 years ago
hard-interface.c	batman-adv: free an hard-interface before adding it	12 years ago
hard-interface.h	batman-adv: Don't always delete softif when last slave was removed	12 years ago
hash.c	batman-adv: update copyright years	12 years ago
hash.h	batman-adv: update copyright years	12 years ago
icmp_socket.c	batman-adv: update copyright years	12 years ago
icmp_socket.h	batman-adv: update copyright years	12 years ago
main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
main.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
network-coding.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
network-coding.h	batman-adv: network coding - save overheard and tx packets for decoding	12 years ago
originator.c	batman-adv: use seq_puts instead of seq_printf when the format is constant	12 years ago
originator.h	hlist: drop the node parameter from iterators	12 years ago
packet.h	batman-adv: Fix endianness errors for network coding	12 years ago
ring_buffer.c	batman-adv: update copyright years	12 years ago
ring_buffer.h	batman-adv: update copyright years	12 years ago
routing.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
routing.h	batman-adv: update copyright years	12 years ago
send.c	batman-adv: network coding - save overheard and tx packets for decoding	12 years ago
send.h	batman-adv: update copyright years	12 years ago
soft-interface.c	batman-adv: fix global protection fault during soft_iface destruction	12 years ago
soft-interface.h	batman-adv: Allow to use rntl_link for device creation/deletion	12 years ago
sysfs.c	batman-adv: Don't always delete softif when last slave was removed	12 years ago
sysfs.h	batman-adv: update copyright years	12 years ago
translation-table.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
translation-table.h	batman-adv: update copyright years	12 years ago
types.h	batman-adv: network coding - receive coded packets and decode them	12 years ago
unicast.c	batman-adv: don't use !! in bool conversion	12 years ago
unicast.h	batman-adv: update copyright years	12 years ago
vis.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
vis.h	batman-adv: update copyright years	12 years ago