Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 71c8a70ba420657d1f548c6f5edb2bbd92ef5e17 Merge: 02c5591 4f3c447 Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Jan 5 02:00:05 2013 +0800

Merge branch 'next'

71c8a70ba420657d1f548c6f5edb2bbd92ef5e17 bat_algo.h | 2 +- bat_iv_ogm.c | 2 +- bitarray.c | 2 +- bitarray.h | 2 +- bridge_loop_avoidance.c | 2 +- bridge_loop_avoidance.h | 2 +- compat.c | 2 +- compat.h | 2 +- debugfs.c | 2 +- debugfs.h | 2 +- distributed-arp-table.c | 2 +- distributed-arp-table.h | 2 +- gateway_client.c | 2 +- gateway_client.h | 2 +- gateway_common.c | 2 +- gateway_common.h | 2 +- hard-interface.c | 2 +- hard-interface.h | 2 +- hash.c | 2 +- hash.h | 2 +- icmp_socket.c | 2 +- icmp_socket.h | 2 +- main.c | 2 +- main.h | 4 ++-- originator.c | 2 +- originator.h | 2 +- packet.h | 2 +- ring_buffer.c | 2 +- ring_buffer.h | 2 +- routing.c | 2 +- routing.h | 2 +- send.c | 2 +- send.h | 2 +- soft-interface.c | 2 +- soft-interface.h | 2 +- sysfs.c | 2 +- sysfs.h | 2 +- translation-table.c | 2 +- translation-table.h | 2 +- types.h | 2 +- unicast.c | 2 +- unicast.h | 2 +- vis.c | 2 +- vis.h | 2 +- 44 files changed, 45 insertions(+), 45 deletions(-)